git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a32737e
ef3a0bf
)
Merge branch 'devel-stable' into for-linus
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:33 +0000
(13:24 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:33 +0000
(13:24 +0000)
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff