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