Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33