]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'v4.1-next/dt-samsung' into for-next
authorKukjin Kim <kgene@kernel.org>
Tue, 17 Mar 2015 17:23:01 +0000 (02:23 +0900)
committerKukjin Kim <kgene@kernel.org>
Tue, 17 Mar 2015 17:23:01 +0000 (02:23 +0900)
commitcb06c6eb60f977c78299bdaba2a541b56e70462e
tree914be54c4152cf7a402010a56e371505fd9ceb5a
parentd26a56a0f995636f81b634b8d2747dc10439724a
parentfa87bd4360ab4244467571f4235ccb2b362fea24
Merge branch 'v4.1-next/dt-samsung' into for-next

Conflicts:
Documentation/devicetree/bindings/arm/exynos/power_domain.txt
Documentation/devicetree/bindings/arm/exynos/power_domain.txt
arch/arm/boot/dts/exynos5420.dtsi