From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 20 May 2011 05:36:52 +0000 (+1000)
Subject: Merge remote branch 'origin/master' into merge
X-Git-Tag: v3.0-rc1~385^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=880102e78547c1db158a17e36cf0cdd98e7ad710;p=pandora-kernel.git

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>
---

880102e78547c1db158a17e36cf0cdd98e7ad710
Reading git-diff-tree failed