Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
authorAvi Kivity <avi@redhat.com>
Thu, 3 Dec 2009 07:30:06 +0000 (09:30 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 3 Dec 2009 07:30:06 +0000 (09:30 +0200)
Signed-off-by: Avi Kivity <avi@redhat.com>

Trivial merge