Merge remote-tracking branch 'agust/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 8 Nov 2011 03:53:55 +0000 (14:53 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 8 Nov 2011 03:53:55 +0000 (14:53 +1100)

Trivial merge