Messages in this thread | | | Date | Mon, 19 Mar 2012 17:47:43 +1100 | From | Stephen Rothwell <> | Subject | linux-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] | |