]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:30:21 +0000 (13:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:30:21 +0000 (13:30 +1000)
commite00c9ee17ab83ba40060832c214df0cc7258bdb3
tree25064e6f30ad1529b06883bbb386530d18aeb9b7
parente61ba52261f53d9e0728f7b54f70904b7ee5bef3
parent15ed1532476fc9da804d53340dffbdf5f92dc5b9
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/maps/pxa2xx-flash.c
27 files changed:
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-sam9260ek.c
arch/arm/mach-at91/board-sam9261ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-dm355-evm.c
arch/arm/mach-davinci/board-dm355-leopard.c
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-mityomapl138.c
arch/arm/mach-davinci/board-neuros-osd2.c
arch/arm/mach-davinci/board-tnetv107x-evm.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/zylonite.c
drivers/mtd/devices/sst25l.c
drivers/mtd/maps/bfin-async-flash.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/mtdchar.c
drivers/mtd/nand/atmel_nand.c
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/mpc5121_nfc.c