git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d07f0e
39ab05c
)
Merge remote branch 'origin/master' into merge
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Fri, 20 May 2011 05:36:52 +0000
(15:36 +1000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Fri, 20 May 2011 05:36:52 +0000
(15:36 +1000)
Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
call to arch/powerpc/platforms/cell/interrupt.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Trivial merge