Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier