From 2b0d8f03d8211058babaa2122ccbc58e0f6e9d39 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:51 -0700 Subject: [PATCH] MAINTAINERS: move Jens Osterkamp to CREDITS Jens' email address bounces, so move his name and entry to CREDITS. Signed-off-by: Joe Perches Cc: Ishizaki Kou Cc: Jens Osterkamp Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 4 ++++ MAINTAINERS | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CREDITS b/CREDITS index 4df764ebe217..1d616640bbf6 100644 --- a/CREDITS +++ b/CREDITS @@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B S: Valladolid 47009 S: Spain +N: Jens Osterkamp +E: jens@de.ibm.com +D: Maintainer of Spidernet network driver for Cell + N: Gadi Oxman E: gadio@netvision.net.il D: Original author and maintainer of IDE/ATAPI floppy/tape drivers diff --git a/MAINTAINERS b/MAINTAINERS index c8a392659dff..67afc4de50ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9590,7 +9590,6 @@ F: include/uapi/linux/spi/ SPIDERNET NETWORK DRIVER for CELL M: Ishizaki Kou -M: Jens Osterkamp L: netdev@vger.kernel.org S: Supported F: Documentation/networking/spider_net.txt