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

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/mtd/Kconfig between commit
b7b6e08f9265db56129931983fc6c06d62c9f4f9 (mtd: Fix MTD_OF_PARTS for all
arch and minor tidy of MTD_PARTITIONS"") from the mtd tree and commit
236cdc7bc718566a7e7cb9f763b51a8dcad88cbe ("of: make drivers depend on
CONFIG_OF instead of CONFIG_PPC_OF") from the devicetree tree.

I just used the version from the mtd tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature