Merge branch 'kvm-master' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 14 Oct 2015 14:35:15 +0000 (16:35 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 14 Oct 2015 14:40:46 +0000 (16:40 +0200)
Merge more important SMM fixes.

1  2 
arch/x86/kvm/x86.c

Simple merge