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