git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec19628
dc7ad3b
)
Merge branch 'devel-stable' into for-linus
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000
(19:28 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000
(19:28 +0100)
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff