git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24056f5 15095bb)
Merge branch 'smp' into misc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:31:35 +0000 (22:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:32:03 +0000 (22:32 +0000)
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c


Trivial merge
Pandora Kernel Repository