Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 28 Jul 2014 03:41:12 +0000 (13:41 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 28 Jul 2014 03:41:12 +0000 (13:41 +1000)
commitcdc2652ee581366798a9ac303b5d855ceebea8d9
tree0cf894e6ba1aba41001984d954969dcc0112a446
parentc49f63530bb689744932be88fecb3fd850300876
parent396a34340cdf7373c00e3977db27d1a20ea65ebc
Merge branch 'merge' into next

Bring in some important fixes from the 3.16 branch