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)
This is a dependency for the tegra/clk branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/tegra20_timer.c


Trivial merge