Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 17 Jun 2009 00:24:53 +0000 (10:24 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 17 Jun 2009 00:24:53 +0000 (10:24 +1000)

Trivial merge