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)
Fix bad x86 regression introduced during merge window.


Trivial merge