]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 04:06:54 +0000 (15:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 04:06:54 +0000 (15:06 +1100)
commitf114e4cc13c87ccc1f7a96f7ddaa962f0184a02a
tree8eeb56714868193eea43a8814f13866d41971a1e
parent3f6a273fb73224ad6355449965b1dc6e76771a61
parenta76f19e11e3b55b06114e7eed45a8ecf70dcab6c
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/mach-omap2/drm.c
arch/arm/mach-ux500/cpu-db8500.c
16 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/drm.c
arch/arm/mach-omap2/pmu.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-omap.c
drivers/usb/host/ohci-omap.c