]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:42:00 +0000 (12:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:42:00 +0000 (12:42 +1000)
1  2 
arch/powerpc/configs/mpc83xx_defconfig
drivers/mtd/mtdpart.c

Simple merge