]> 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>
Tue, 30 Oct 2012 03:22:22 +0000 (14:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:22:22 +0000 (14:22 +1100)
commita1264a9a6b2cbc694113d1a22af122b270fb5af2
tree9f2440d1e2270f2102749c27c6e3fea7f8ced5db
parenta49d8b233440fca1eb8560acf2795f5cd0df0add
parentbe792b96e654909d24003c09ff1090c8e93d555e
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/cpu-db8500.c
13 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-imx/clk-imx25.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/dma/imx-dma.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/staging/tidspbridge/include/dspbridge/host_os.h
drivers/usb/host/ohci-omap.c