git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77b6706
ab6f6d8
631a7b5
86bc52e
)
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000
(21:57 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000
(21:57 +0100)
These are all dependencies for the renesas/boards2 branch.
Conflicts:
arch/arm/configs/marzen_defconfig
Trivial merge