summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-28 23:39:05 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-28 23:39:05 -0500
commitb656cc64cf815d8ff6e99883a531fafc48199bd0 (patch)
treea5d29b7163327e406233598b843adc2e4edbbc52 /MAINTAINERS
parent74abc20cedf6f95a0065665c55180ef2d4828ba5 (diff)
parent8b7ac017aa0f9b803e9da9caafa5fe9544ecf5c7 (diff)
downloadop-kernel-dev-b656cc64cf815d8ff6e99883a531fafc48199bd0.zip
op-kernel-dev-b656cc64cf815d8ff6e99883a531fafc48199bd0.tar.gz
Merge branch 's390-next'
Ursula Braun says: ==================== s390: network patches for net-next here are some s390 related patches for net-next ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0597c5b..274a005 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8328,7 +8328,6 @@ F: block/partitions/ibm.c
S390 NETWORK DRIVERS
M: Ursula Braun <ursula.braun@de.ibm.com>
-M: Frank Blaschka <blaschka@linux.vnet.ibm.com>
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/
OpenPOWER on IntegriCloud