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

[Stephen Rothwell]

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
documentation") from the dt-rh tree.

The former replaced the text (and fixed the typo) fixed by the latter, so
I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature