Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 00:35:52 +0000 (10:35 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 00:35:52 +0000 (10:35 +1000)

Trivial merge