aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-20 18:50:07 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-20 18:50:07 -1000
commit87885b700b9b697ce8601d415cb905862750c3b9 (patch)
tree6581666c814ca2e94c1dda4f1c751277391d355f
parentMerge tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff)
parentKVM: taking co-maintenance (diff)
downloadlinux-dev-87885b700b9b697ce8601d415cb905862750c3b9.tar.xz
linux-dev-87885b700b9b697ce8601d415cb905862750c3b9.zip
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM maintainership update from Avi Kivity: "After many years of maintaining KVM, I am moving on. It was a real pleasure for me to work with so many talented and dedicated hackers on this project. Replacing me will be one of those talented and dedicated hackers, Gleb, who has authored hundreds of patches in and around KVM." * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: taking co-maintenance KVM: Retire as maintainer
-rw-r--r--CREDITS5
-rw-r--r--MAINTAINERS2
2 files changed, 6 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index d8fe12a9421f..2346b09ca8bb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38
S: D-64295
S: Germany
+N: Avi Kivity
+E: avi.kivity@gmail.com
+D: Kernel-based Virtual Machine (KVM)
+S: Ra'annana, Israel
+
N: Andi Kleen
E: andi@firstfloor.org
U: http://www.halobates.de
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f043a729855..e12b0a68c1af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4280,8 +4280,8 @@ F: include/linux/lockd/
F: include/linux/sunrpc/
KERNEL VIRTUAL MACHINE (KVM)
-M: Avi Kivity <avi@redhat.com>
M: Marcelo Tosatti <mtosatti@redhat.com>
+M: Gleb Natapov <gleb@redhat.com>
L: kvm@vger.kernel.org
W: http://kvm.qumranet.com
S: Supported