Merge commit 'jwb/jwb-next'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 7 Oct 2008 00:15:07 +0000 (11:15 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 7 Oct 2008 00:15:07 +0000 (11:15 +1100)

Trivial merge