Merge commit '75b10c43365e2a9cab5398f31b96a463b0d57eff' into upstream-merge
commit65160cfd3d33e90a718e4bc9524614aae8416956
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 22 Oct 2010 13:52:13 +0000 (22 11:52 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 22 Oct 2010 13:52:13 +0000 (22 11:52 -0200)
tree99113280ed66c3a57f23d674220ee62423c9f0ae
parent9de479a97aeda2820f4408a760d3152a60cc9bb7
parent75b10c43365e2a9cab5398f31b96a463b0d57eff
Merge commit '75b10c43365e2a9cab5398f31b96a463b0d57eff' into upstream-merge

* commit '75b10c43365e2a9cab5398f31b96a463b0d57eff':
  kvm: factor out kvm_has_msr_star
  kvm: add save/restore of MSR_VM_HSAVE_PA
  Fix build on !KVM_CAP_MCE
  x86, mce: broadcast mce depending on the cpu version
  x86, mce: ignore SRAO only when MCG_SER_P is available

Conflicts:
target-i386/kvm.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
target-i386/kvm.c