Merge commit 'jwb/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 Jan 2010 05:52:27 +0000 (16:52 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 Jan 2010 05:52:27 +0000 (16:52 +1100)

Trivial merge