From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 16 Jul 2008 01:07:59 +0000 (+1000)
Subject: Merge commit 'origin/master'
X-Git-Tag: v2.6.27-rc1~1058^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c3d4aaec3338201b449034beac41635866bddf;p=pandora-kernel.git

Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c
---

84c3d4aaec3338201b449034beac41635866bddf
Reading git-diff-tree failed