Merge commit 'v2.6.36-rc3' into x86/memblock