Merge remote branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:59 +0000 (14:36 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:59 +0000 (14:36 +1100)

Trivial merge