Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 23 Jul 2010 03:46:21 +0000 (13:46 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 23 Jul 2010 03:46:21 +0000 (13:46 +1000)

Trivial merge