git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba8bb18
ae72fd5
)
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:20:17 +0000
(23:20 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 5 Dec 2011 23:20:17 +0000
(23:20 +0000)
Conflicts:
arch/arm/common/gic.c
arch/arm/plat-omap/include/plat/common.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff