Merge branch 'tegra/clk' into next/dt2
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:52:43 +0000 (17:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:52:43 +0000 (17:52 +0200)
commitf8da810cbb823c9781d703319ac4303568008fae
tree03b33a2e85f0cfc2547749aa28acf4630f6989ac
parent03e86b3a27d4649fe0109617bae1fced54e150e0
parent964ea47572b89589b61b553e44bbe9907d4f12a6
Merge branch 'tegra/clk' into next/dt2

This is a dependency for the tegra/dt branch.

Conflicts:
drivers/clocksource/tegra20_timer.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
drivers/clocksource/tegra20_timer.c