Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 19 Mar 2010 05:23:55 +0000 (16:23 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 19 Mar 2010 05:23:55 +0000 (16:23 +1100)

Trivial merge