From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 16 Dec 2011 00:24:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'jwb/next' into next
X-Git-Tag: v3.3-rc1~181^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e7342e7789fa2ca9202701467428726cbcfd649;p=pandora-kernel.git

Merge remote-tracking branch 'jwb/next' into next

Conflicts:
	arch/powerpc/platforms/40x/ppc40x_simple.c
---

1e7342e7789fa2ca9202701467428726cbcfd649
Reading git-diff-tree failed