Merge remote branch 'jwb/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Aug 2010 04:36:45 +0000 (14:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Aug 2010 04:36:45 +0000 (14:36 +1000)

Trivial merge