| commit | 58f800d5ace99c49e6418cb5757d868f2746acb4 | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Tue Oct 13 21:32:50 2015 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Tue Oct 13 21:32:50 2015 +0200 |
| tree | 5e6d8e459f282e35b8b8245a39de838a2c364d42 | |
| parent | 1330a0170a48ad3788eff01aaf889203652ab4c7 [diff] | |
| parent | 73917739334c6509833b0403b81d4a04a8784bdf [diff] |
Merge branch 'kvm-master' into HEAD This merge brings in a couple important SMM fixes, which makes it easier to test latest KVM with unrestricted_guest=0 and to test the in-progress work on SMM support in the firmware. Conflicts: arch/x86/kvm/x86.c