Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)

Trivial merge