diff --git a/[refs] b/[refs] index 2a007e866627..1fd91148e298 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ecee4ba4eb2ada7ece7c41eb08cf7bc51b579e2 +refs/heads/master: 85f8fffe3c2ab13f13526c46b5471fc22e98ccfe diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a942f3852499..8ddb5d3af760 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2338,6 +2338,16 @@ L: kvm-ia64-devel@lists.sourceforge.net W: kvm.sourceforge.net S: Supported +KERNEL VIRTUAL MACHINE for s390 (KVM/s390) +P: Carsten Otte +M: cotte@de.ibm.com +P: Christian Borntraeger +M: borntraeger@de.ibm.com +M: linux390@de.ibm.com +L: linux-s390@vger.kernel.org +W: http://www.ibm.com/developerworks/linux/linux390/ +S: Supported + KEXEC P: Eric Biederman M: ebiederm@xmission.com