git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
017c899
3bdc348
bad1340
)
Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000
(22:51 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000
(22:51 +0000)
Dependencies for tegra/soc branch
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge