]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 07:42:45 +0000 (17:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 07:42:45 +0000 (17:42 +1000)
commitbbad2dafbb1ac558b0036f37cb72567307af1b3a
tree99c336273af11b66d0e1ae19fca55dc897e9e1ae
parente2b4f07c13935bc45e969ca16f76e6ae1bae54c0
parentd4f7152532f8278e5286a2a24d34cb0680130045
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
Documentation/devicetree/bindings/usb/exynos-usb.txt
arch/arm/Kconfig
arch/arm/boot/dts/exynos4412-smdk4412.dts
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-s3c24xx/Kconfig
drivers/clocksource/exynos_mct.c
drivers/cpufreq/Makefile
drivers/usb/host/ohci-exynos.c
arch/arm/Kconfig
arch/arm/boot/dts/exynos4412-origen.dts
arch/arm/boot/dts/exynos4412.dtsi
arch/arm/mach-exynos/Kconfig
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Makefile
drivers/cpufreq/s3c24xx-cpufreq.c