git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b228e8
f37a53c
)
Merge branch 'dt/gic' into highbank/soc
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:11:34 +0000
(14:11 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:11:34 +0000
(14:11 +0100)
Conflicts:
arch/arm/Kconfig
Trivial merge