]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:26:44 +0000 (16:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:26:44 +0000 (16:26 +1100)
commita1d765c00f0f533c972c33cf248917f8936b8a1c
tree1900bec73e5b6107259fdbc997ed7e15a7a633d9
parentc3ee17a5a3b3c826a3e32faf81f9e5bde0c8cfdf
parent119754e57609113818f1226925046bfd54d6dc53
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
MAINTAINERS
drivers/clk/samsung/clk-exynos4.c
Documentation/devicetree/bindings/clock/exynos5250-clock.txt
MAINTAINERS
arch/arm/boot/dts/exynos4412-odroidx.dts
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos5250-cros-common.dtsi
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
drivers/clk/Makefile
drivers/clk/samsung/clk-exynos4.c
drivers/clk/tegra/clk-periph.c
include/linux/clk-provider.h