Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 30 Jul 2010 05:02:32 +0000 (15:02 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 30 Jul 2010 05:02:32 +0000 (15:02 +1000)

Trivial merge