Merge commit 'jwb/next' into next
authorBenjamin Herrenschmidt <[email protected]>
Mon, 23 Nov 2009 23:02:16 +0000 (10:02 +1100)
committerBenjamin Herrenschmidt <[email protected]>
Mon, 23 Nov 2009 23:02:16 +0000 (10:02 +1100)

Trivial merge