Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Mar 2009 02:38:30 +0000 (13:38 +1100)

Trivial merge