Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)

Trivial merge