Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/integrator-flash.c between commit adf0040096e4 ("ARM:
6906/1: MTD: Remove integrator-flash") from Linus' tree and commit
ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()")
from the mtd tree.
The former removes the file updated by the latter, so I just removed it.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpllwllHNI7d.pgp
Description: PGP signature
