Merge commit 'jwb/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 20 Dec 2009 22:30:45 +0000 (09:30 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 20 Dec 2009 22:30:45 +0000 (09:30 +1100)

Trivial merge