git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e195ffb
7b9dd47
)
Merge branch 'depends/rmk/for-linus' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Sat, 7 Jan 2012 20:53:13 +0000
(20:53 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Sat, 7 Jan 2012 20:53:13 +0000
(20:53 +0000)
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Trivial merge