61208372fb4b0 parent 22763c5cf3690a681551162c15d34d935308c8d7 parent 8e7cac79808b62f242069a6ac88d364d35621371 author Avi Kivity 1259825406 +0200 committer Avi Kivity 1259825406 +0200 Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33 Signed-off-by: Avi Kivity