Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 3 Mar 2009 02:30:03 +0000 (13:30 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 3 Mar 2009 02:30:03 +0000 (13:30 +1100)

Trivial merge