tree 22aaeaeb38a3d5d77e2b8303ffe25e581ee172a3
parent 946edc47b6106e7fbacac667fdf26d858231c7c4
parent 6d1068b3a98519247d8ba4ec85cd40ac136dbdf9
author Linus Torvalds <torvalds@linux-foundation.org> 1352770673 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1352770673 -0800

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fix from Marcelo Tosatti:
 "A correction for user triggerable oops"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: invalid opcode oops on SET_SREGS with OSXSAVE bit set (CVE-2012-4461)