Merge remote-tracking branch 'l2-mtd/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)
diff --cc Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Simple merge
diff --cc arch/arm/mach-omap2/gpmc.c
Simple merge
diff --cc drivers/mtd/mtd_blkdevs.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Jun 2014 02:14:43 +0000 (12:14 +1000)
		1	2
Documentation/devicetree/bindings/mtd/gpmc-nand.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtd_blkdevs.c	patch \|	diff1 \|	diff2 \|	blob \| history