Merge branch 'merge' into next

Bring in some important fixes from the 3.16 branch
This commit is contained in:
Benjamin Herrenschmidt 2014-07-28 13:41:12 +10:00
commit cdc2652ee5
10 changed files with 40 additions and 14 deletions