From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 28 Jan 2009 06:15:34 +0000 (+1100)
Subject: Merge commit 'jwb/jwb-merge' into merge
X-Git-Tag: v2.6.29-rc3~1^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6469c92e0a4879e57bccbbacb2b724672a4fa8fb;p=pandora-kernel.git

Merge commit 'jwb/jwb-merge' into merge

Manual merge of:
	arch/powerpc/configs/44x/warp_defconfig
---

6469c92e0a4879e57bccbbacb2b724672a4fa8fb
Reading git-diff-tree failed