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

1 files changed, 4 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 829c0321108b..dbf4880fdb08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4641,12 +4641,13 @@ F:	include/linux/sunrpc/
 F:      include/uapi/linux/sunrpc/
 
 KERNEL VIRTUAL MACHINE (KVM)
-M:      Marcelo Tosatti <mtosatti@redhat.com>
 M:      Gleb Natapov <gleb@redhat.com>
+M:      Paolo Bonzini <pbonzini@redhat.com>
 L:      kvm@vger.kernel.org
-W:      http://kvm.qumranet.com
+W:      http://linux-kvm.org
 S:      Supported
-F:      Documentation/*/kvm.txt
+F:      Documentation/*/kvm*.txt
+F:      Documentation/virtual/kvm/
 F:      arch/*/kvm/
 F:      arch/*/include/asm/kvm*
 F:      include/linux/kvm*