Merge commit 'v2.6.28-rc5' into x86/cleanups