Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 15 Jan 2010 02:40:03 +0000 (13:40 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 15 Jan 2010 02:40:03 +0000 (13:40 +1100)

Trivial merge