Merge commit 'v2.6.29-rc5' into x86/apic