Merge remote-tracking branch 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Jan 2012 22:40:34 +0000 (09:40 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Jan 2012 22:40:34 +0000 (09:40 +1100)

Trivial merge