]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 03:37:19 +0000 (14:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 03:37:19 +0000 (14:37 +1100)
commita46cca84c78b58e64ce533c8b2a46a5f6a42e565
tree6773ef478ac1e066c64917ad363d3eced72d6a2a
parent5ad7044befdd704089ebacd877b7a70e49f09b6c
parentf1464f1743ef4a63231d8dc03de705b3a3e57e52
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/pinctrl/pinctrl-nomadik.c
21 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6q.dtsi
arch/arm/kernel/smp_twd.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-omap2/pmu.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/input/keyboard/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/nand/Kconfig
drivers/pinctrl/pinctrl-nomadik.c
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-omap.c
drivers/usb/host/ohci-omap.c