Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Nov 2009 23:02:16 +0000 (10:02 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Nov 2009 23:02:16 +0000 (10:02 +1100)

Trivial merge