]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)
commitc28ad2bc713103b2b4c0ef77bc91dcd9382208c3
treefe9fcaab51cb5adea955070f6609dc998d46db69
parent1e27ab4d297fda68b0f2cdb6b274108c2a4a350e
parented838ba22ae2a7e9f83200e17835e199be5c04c4
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c
33 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/common/Makefile
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.h
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/mach-highbank/Kconfig
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/fuse.c
arch/arm/mach-ux500/Kconfig
drivers/block/Kconfig
drivers/cpufreq/integrator-cpufreq.c
drivers/cpuidle/Kconfig.arm
drivers/dma/Kconfig
drivers/ide/Kconfig
drivers/input/serio/Kconfig
drivers/pci/host/Kconfig
drivers/usb/host/ohci-s3c2410.c
drivers/usb/musb/ux500.c
drivers/video/cyber2000fb.c