diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
| commit | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (patch) | |
| tree | 49bbe7b27f8571c7716e9cbc7fbbe462ea82077a /arch/arm%253fid%253d4c3ffffdbca2e6f6f5125fa7b149d87a13f92c94%3fid%3d494cc7606180bbf0bd7c82afeaacc45d5035d7cc?id=3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 | |
| 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>
Diffstat (limited to 'arch/arm%253fid%253d4c3ffffdbca2e6f6f5125fa7b149d87a13f92c94%3fid%3d494cc7606180bbf0bd7c82afeaacc45d5035d7cc?id=3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64')
0 files changed, 0 insertions, 0 deletions