Merge branch 'ps3' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:09:15 +0000 (11:09 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:09:15 +0000 (11:09 +1100)

Trivial merge