]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'origin/master' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 20 May 2011 05:36:52 +0000 (15:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 20 May 2011 05:36:52 +0000 (15:36 +1000)
commit4790e7e5a1c35fb1b377046965a54142ee8f4572
tree3fff9cc54c44dafe275cfabefb96c589e08d971d
parentfad8d857a07253c77251e9b91bf2c1ea01d42658
parentc5b165f0bfc253cd8694678b3af2fd75df4bc393
Merge remote branch 'origin/master' into merge

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>
arch/powerpc/include/asm/mpic.h
arch/powerpc/kernel/smp.c
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/cell/interrupt.c
arch/powerpc/platforms/powermac/pic.c
arch/powerpc/sysdev/ipic.c
arch/powerpc/sysdev/mpic.c