git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55922c9 2da7fbe)
Merge remote-tracking branch 'sparc-current/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:25:37 +0000 (11:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:25:37 +0000 (11:25 +1000)
Conflicts:
arch/sparc/include/asm/smp_32.h
arch/sparc/kernel/smp_32.c


Trivial merge
Pandora Kernel Repository