git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a552d5 846a136)
Merge branch 'fixes' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
Conflicts:
arch/arm/kernel/smp.c


Trivial merge
Pandora Kernel Repository