Merge remote branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 29 Jun 2011 02:45:43 +0000 (12:45 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 29 Jun 2011 02:45:43 +0000 (12:45 +1000)

Trivial merge