| commit | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 16:54:27 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 16:54:27 2013 +0200 |
| tree | 49bbe7b27f8571c7716e9cbc7fbbe462ea82077a | |
| parent | d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa [diff] | |
| parent | 38be85de698ef3f2755ee0eabf520530757860aa [diff] |
Merge branch 'tegra/soc' into next/multiplatform This is a dependency for the tegra multiplatform series. Conflicts: drivers/clocksource/tegra20_timer.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>