lkml.org 
[lkml]   [2012]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the l2-mtd tree
Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/atmel_nand.c between commit 4331c79c6895 ("mtd: do not
use plain 0 as NULL") from the l2-mtd tree and commit d6a016616ba8
("atmel/nand: add DT support") from the arm-soc tree.

The latter superceded the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-03-19 07:51    [W:1.424 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site