Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 16 Feb 2010 23:00:42 +0000 (10:00 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 16 Feb 2010 23:00:42 +0000 (10:00 +1100)

Trivial merge