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)
Bring in some important fixes from the 3.16 branch


Trivial merge