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

[Stephen Rothwell]

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/lantiq-flash.c between commit c84c24dc7ed7 ("MIPS:
Lantiq: Fix MTD registration of NOR device") from the mips tree and
commit 31963c9999a3 ("mtd: lantiq-flash.c: use
mtd_device_parse_register") from the l2-mtd tree.

I fixed it up (by using the latter change which supercedes the former).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature