Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Jan 2009 05:24:38 +0000 (16:24 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Jan 2009 05:24:38 +0000 (16:24 +1100)

Trivial merge