Merge branch 'eeh' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 12 Mar 2012 23:15:35 +0000 (10:15 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 12 Mar 2012 23:15:35 +0000 (10:15 +1100)

Trivial merge