linux-next: manual merge of the l2-mtd tree with the at91 tree
From: Stephen Rothwell
Date: Thu Sep 08 2011 - 23:29:48 EST
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 6939fd49787e ("at91:
merge board USB-A9260 and USB-A9263 together") from the at91 tree and
commit 29921652b159 ("mtd: ATMEL, AVR32: inline nand partition table
access") from the l2-mtd tree.
The former removed the file modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature