Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 22 Jul 2011 03:16:41 +0000 (13:16 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 22 Jul 2011 03:16:41 +0000 (13:16 +1000)

Trivial merge