Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7316ab62e5af3c0857acfbeff154e0bfaa0eb05e..cda045337a9d319eca95e6b297d983b54085344a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4002,8 +4002,8 @@ F:        arch/ia64/include/asm/kvm*
 F:     arch/ia64/kvm/
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
-M:     Carsten Otte <cotte@de.ibm.com>
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
+M:     Cornelia Huck <cornelia.huck@de.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/