Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 27 Aug 2009 03:12:40 +0000 (13:12 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 27 Aug 2009 03:12:40 +0000 (13:12 +1000)

Trivial merge