Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 30 Aug 2011 05:14:46 +0000 (15:14 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 30 Aug 2011 05:14:46 +0000 (15:14 +1000)

Trivial merge