diff --git a/[refs] b/[refs] index 8d00790f3aa6..f8ff417403ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f319a5249830392090896cd794fabf9d6d4a4ed +refs/heads/master: a968cd3ef1d315b8c4c48ea65ab5aac8421c2612 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4f96ac81089c..ea3c88ed3ade 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3088,6 +3088,7 @@ S: Supported F: Documentation/s390/kvm.txt F: arch/s390/include/asm/kvm* F: arch/s390/kvm/ +F: drivers/s390/kvm/ KEXEC M: Eric Biederman @@ -4502,6 +4503,7 @@ L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: arch/s390/ +F: drivers/s390/ S390 NETWORK DRIVERS M: Ursula Braun @@ -4517,6 +4519,7 @@ M: Felix Beck M: Ralph Wuerthner M: linux390@de.ibm.com L: linux-s390@vger.kernel.org +W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: drivers/s390/crypto/