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

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

Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)

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

Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/configs/mpc83xx_defconfig
Simple merge
diff --cc drivers/mtd/mtdpart.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 02:06:50 +0000 (12:06 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/mpc83xx_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdpart.c	patch \|	diff1 \|	diff2 \|	blob \| history