Merge commit 'v3.9-rc5' into next/clk-exynos
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 8 Apr 2013 16:10:13 +0000 (01:10 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 8 Apr 2013 16:10:13 +0000 (01:10 +0900)
commitda821eb7d42935b0f7056d98c75fd1150f6636f4
treede83ac171d51bbe7621110c3145a68c198b13711
parent296f3f2c9322480400338f71d8c118107f9a7f20
parent07961ac7c0ee8b546658717034fe692fd12eefa9
Merge commit 'v3.9-rc5' into next/clk-exynos

Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
arch/arm/Kconfig
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
arch/arm/mach-s5pv210/mach-goni.c