Merge commit 'v2.6.29-rc7' into core/locking