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

Conflicts:
drivers/clocksource/tegra20_timer.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge