Merge branch 'tegra/soc' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:07:36 +0000 (17:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 15:07:36 +0000 (17:07 +0200)
commit1194b152cd4eff475652785ce366b20afe82dfcf
tree78da3848410f05949714b2e475d4cf92b463fb31
parent86feb64f5bfe75da74f4a2faf18b5e57be9cde5e
parent38be85de698ef3f2755ee0eabf520530757860aa
Merge branch 'tegra/soc' into next/drivers

This is a dependency for the tegra/clk branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/tegra20_timer.c
arch/arm/Kconfig
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
arch/arm/mach-tegra/board-harmony-pcie.c
drivers/clk/tegra/clk-tegra20.c
drivers/clocksource/tegra20_timer.c