Merge branch 'tegra/soc' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:54:27 +0000 (16:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:54:27 +0000 (16:54 +0200)
commit3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64
tree49bbe7b27f8571c7716e9cbc7fbbe462ea82077a
parentd93bea007ab3d77b796eb99fb4ff4eeb013e0dfa
parent38be85de698ef3f2755ee0eabf520530757860aa
Merge branch 'tegra/soc' into next/multiplatform

This is a dependency for the tegra multiplatform series.

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/clk/tegra/clk-tegra20.c
drivers/clocksource/tegra20_timer.c