]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:50:24 +0000 (16:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:50:24 +0000 (16:50 +1000)
commit85bdc6b26e53f2727610d9b8d277d8a59cf46fb8
treef0490fb5ca60e1d187459f2fc8935d484000ad81
parent7a585f0fda86ca5c1b5f7e0831a44b4379daa6e1
parent045779942c04646a222289989e6a5b617dfdedf7
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/tegra/clk-tegra114.c
Documentation/devicetree/bindings/clock/silabs,si5351.txt
MAINTAINERS
arch/arm/mach-tegra/common.c
drivers/clk/Makefile
drivers/clk/clk-si5351.c
drivers/clk/clk-vt8500.c
drivers/clk/clk.c
drivers/clk/tegra/clk-tegra114.c
drivers/clk/tegra/clk-tegra30.c
drivers/mfd/db8500-prcmu.c
drivers/mfd/dbx500-prcmu-regs.h