]> 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>
Thu, 13 Oct 2011 00:17:28 +0000 (11:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:17:31 +0000 (11:17 +1100)
commitbe586d4bb98850cffb4b02198f3cad1614aadaad
tree2d0f73242aa886ca889ec2c31c6cbc75da62c876
parent8cfdee038bc7bf8cde49104e86acd781531147e2
parentb3a522946222abcd36d3ae723f63b3ce70a9dc4a
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-ep93xx/Makefile.boot
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/Kconfig
36 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/kernel/head.S
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-davinci/da850.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/Makefile.boot
arch/arm/mach-u300/core.c
arch/arm/mach-ux500/board-mop500-pins.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-vexpress/hotplug.c
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/devices.c