| commit | 1194b152cd4eff475652785ce366b20afe82dfcf | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 17:07:36 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 17:07:36 2013 +0200 |
| tree | 78da3848410f05949714b2e475d4cf92b463fb31 | |
| parent | 86feb64f5bfe75da74f4a2faf18b5e57be9cde5e [diff] | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa [diff] |
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