git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d93bea0
38be85d
)
Merge branch 'tegra/soc' into next/multiplatform
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 9 Apr 2013 14:54:27 +0000
(16:54 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 9 Apr 2013 14:54:27 +0000
(16:54 +0200)
This is a dependency for the tegra multiplatform series.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff