tree 00fd227c4cbf9f97fbe5a9bf0db8011d8594f317
parent 7ed7fe5e82c9fc8473974fbd7389d169b8f17c77
parent e48bb497b95a0f7127f9ff596a6b4c4b206f7dcf
author Linus Torvalds <torvalds@linux-foundation.org> 1206461179 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206461179 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: MMU: Fix memory leak on guest demand faults
  KVM: VMX: convert init_rmode_tss() to slots_lock
  KVM: MMU: handle page removal with shadow mapping
  KVM: MMU: Fix is_rmap_pte() with io ptes
  KVM: VMX: Restore tss even on x86_64