| commit | a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Wed May 20 11:46:12 2015 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Wed May 20 12:31:37 2015 +0200 |
| tree | f690b927077f73993bc7e01c10fc47cce0460b85 | |
| parent | ed3cf15271fa150320b46f03d369777b71786298 [diff] | |
| parent | c447e76b4cabb49ddae8e49c5758f031f35d55fb [diff] |
Merge branch 'kvm-master' into kvm-next Grab MPX bugfix, and fix conflicts against Rik's adaptive FPU deactivation patch. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>