tree fed8bc25883a01dc2e4916fe90a58f07b26ed93b
parent b4d3ba3346f092b9185da991414775281ceacaac
parent 6d17c0d1e8a66f5508082cb0fecb8afb7e9a21e4
author Linus Torvalds <torvalds@linux-foundation.org> 1369325888 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1369325888 -0700

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

Pull kvm bugfixes from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()
  KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API.
  KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry