| commit | f8da810cbb823c9781d703319ac4303568008fae | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 17:52:43 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 17:52:43 2013 +0200 |
| tree | 03b33a2e85f0cfc2547749aa28acf4630f6989ac | |
| parent | 03e86b3a27d4649fe0109617bae1fced54e150e0 [diff] | |
| parent | 964ea47572b89589b61b553e44bbe9907d4f12a6 [diff] |
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>