]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Jul 2013 00:56:33 +0000 (10:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Jul 2013 00:56:33 +0000 (10:56 +1000)
1  2 
arch/avr32/mach-at32ap/at32ap700x.c
arch/mips/bcm63xx/nvram.c
drivers/mtd/nand/Kconfig

Simple merge
Simple merge
Simple merge