]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 01:57:02 +0000 (11:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 01:57:02 +0000 (11:57 +1000)
commitc5d764fe68187f960168f741ebdaba532241489a
treebdda05e628e793955dff880b9313b0f72ed62869
parent1de8df45ad74be52aef235ff769f4aa5b4457a5c
parent7ce041ce0f686a1a14165ce062386452df6523b4
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
16 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-usb-a926x.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/Makefile.boot
arch/arm/mach-u300/core.c
arch/arm/mach-vexpress/hotplug.c
arch/arm/plat-mxc/include/mach/gpio.h