git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e69a8c a9ff8f6)
Merge branch 'fixes' into for-linus
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
Conflicts:

arch/arm/mach-versatile/core.c


Trivial merge
Pandora Kernel Repository