Merge remote-tracking branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 1 Sep 2011 05:57:23 +0000 (15:57 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 1 Sep 2011 05:57:32 +0000 (15:57 +1000)
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)


Trivial merge