]> 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>
Wed, 31 Oct 2012 05:19:16 +0000 (16:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:19:16 +0000 (16:19 +1100)
commit1e8da6cc60e1920d323950041c4141841eb7464e
tree8e69bec254472de879ffa037dff77c0aa60ff57a
parent4816447f1e1e94ed3e38f87b39e01f2cb2df47a7
parentbe792b96e654909d24003c09ff1090c8e93d555e
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
14 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-imx/clk-imx25.c
arch/arm/mach-omap2/drm.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