Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/Kconfig and drivers/mtd/maps/redwood.c between commit
c76986cca8379db619de4b6c6b7359125df0e341 ("Remove REDWOOD_[456] config
options and conditional code") from Linus' tree and commit
73ee5760253dc8893502e19a9cb118d25dab21ec ("mtd: remove redwood map
driver") from the mtd tree.

The latter just went further by actually removing the driver so I used
that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/