Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Jul 2014 05:38:12 +0000 (15:38 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Jul 2014 05:38:12 +0000 (15:38 +1000)

Trivial merge