From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 21 Oct 2008 04:52:04 +0000 (+1100)
Subject: Merge commit 'origin' into master
X-Git-Tag: v2.6.28-rc1~58^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02efb906d12c9d4eb2ab7c59049ba9545e5412d;p=pandora-kernel.git

Merge commit 'origin' into master

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h
---

a02efb906d12c9d4eb2ab7c59049ba9545e5412d
Reading git-diff-tree failed