Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 Mar 2012 23:56:00 +0000 (10:56 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 Mar 2012 23:56:00 +0000 (10:56 +1100)

Trivial merge