Merge remote branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)

Trivial merge