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)
commit5b97259220cae53b174817aab6ab1ff1b616aaf3
tree69cc121a6a933518bb8c65ad96828d4e1f8778dc
parentcd1154770ba984f4c766cac5ea42c38880080b1d
parentf56029410a13cae3652d1f34788045c40a13ffc7
Merge branch 'merge' into next