Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 30 May 2010 23:59:00 +0000 (09:59 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 30 May 2010 23:59:00 +0000 (09:59 +1000)

Trivial merge