Merge commit '33b458d276bb' into kvm-next
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:51:07 +0000 (16:51 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:51:07 +0000 (16:51 +0200)
commitdc720f95939280f9e69cafe7389be6d0fa6f22dd
treee93d713cebd69147e59a5a1df23527f1abc3ca6a
parent27e6fb5dae2819d17f38dc9224692b771e989981
parent33b458d276bbdbe28febac0742835002b9f4778d
Merge commit '33b458d276bb' into kvm-next

Fix bad x86 regression introduced during merge window.