]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:14:37 +0000 (16:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:14:37 +0000 (16:14 +1000)
commit5ea092d5d65737f996477374e157231728bf6f6c
tree0dd04794138630cae21231e528f33cae20df11c4
parente1165ede970c1f4f7399b0a548e23989d9fee281
parent7064f6bd86278029348c36d30bd325e7e05b6fee
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/tegra/clk-tegra114.c
13 files changed:
Documentation/devicetree/bindings/clock/silabs,si5351.txt
MAINTAINERS
arch/arm/mach-tegra/common.c
arch/powerpc/platforms/Kconfig.cputype
drivers/clk/Makefile
drivers/clk/clk-si5351.c
drivers/clk/clk-vt8500.c
drivers/clk/clk.c
drivers/clk/samsung/clk-exynos4.c
drivers/clk/tegra/clk-tegra114.c
drivers/clk/tegra/clk-tegra30.c
drivers/mfd/db8500-prcmu.c
drivers/mfd/dbx500-prcmu-regs.h