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

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

Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)

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

Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/mtd/maps/pxa2xx-flash.c
Simple merge
diff --cc drivers/mtd/nand/mpc5121_nfc.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/pxa2xx-flash.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mpc5121_nfc.c	patch \|	diff1 \|	diff2 \|	blob \| history