Merge commit 'v2.6.29-rc2' into x86/mm