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

Signed-off-by: Avi Kivity <avi@redhat.com>