linux-next: manual merge of the mtd tree with the tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/excite_nandflash.c between commit
9e910a91b88d450951c849d12598645562acc4b2 ("MIPS: eXcite: Remove
platform") from the mips tree and commit
8fead79c96c68164372c47c7b3c79d2da0871c93 ("mtd: move excite_nand_remove
to .devexit.text") from the mtd tree.

The former just removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature