git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86c1e5a
f37a53c
)
Merge branch 'dt/gic' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:08:10 +0000
(14:08 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:08:10 +0000
(14:08 +0100)
Conflicts:
arch/arm/include/asm/localtimer.h
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff