Merge remote-tracking branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 26 Feb 2012 23:50:11 +0000 (10:50 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 26 Feb 2012 23:50:11 +0000 (10:50 +1100)

Trivial merge