Merge branch 'v2.6.37-rc2' into for-2.6.38/core