Merge remote branch 'kumar/merge' into merge
authorBenjamin Herrenschmidt <[email protected]>
Mon, 18 Apr 2011 02:09:37 +0000 (12:09 +1000)
committerBenjamin Herrenschmidt <[email protected]>
Mon, 18 Apr 2011 02:09:37 +0000 (12:09 +1000)

Trivial merge