]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:02:32 +0000 (11:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:02:32 +0000 (11:02 +1000)
commitbafbf229601afbbc5d868dfb739b5c44d3831d19
tree789a33bac5fa03a41b68a206e1d55e95163eada7
parent529bfa72fed0d4cbed4ee84b849f45dfb2612264
parentf54dd6aff1014250bda6465bd28d87cbb921be3e
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
drivers/mtd/maps/lantiq-flash.c
20 files changed:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-kb9202.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-qil-a9260.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9-l9260.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-sam9rlek.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-at91/board-yl-9200.c
arch/arm/mach-mmp/aspenite.c
drivers/mtd/maps/lantiq-flash.c
drivers/mtd/onenand/omap2.c