git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06f365a 6645cb6)
Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:09:07 +0000 (23:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:09:07 +0000 (23:09 +0100)
Conflicts:
arch/arm/kernel/entry-armv.S


Trivial merge
Pandora Kernel Repository