Merge commit 'v2.6.38-rc2' into core/locking