Merge commit 'v2.6.28-rc6' into x86/urgent