diff options
author | Joe Perches <joe@perches.com> | 2015-06-30 17:59:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 22:45:00 -0400 |
commit | 2b0d8f03d8211058babaa2122ccbc58e0f6e9d39 (patch) | |
tree | 60cf20ef2b8de5bfcdc0436f16a4579abaa63373 | |
parent | 70a116dca45a8480429c4d0803e129a18f035c6e (diff) |
MAINTAINERS: move Jens Osterkamp to CREDITS
Jens' email address bounces, so move his name and entry to CREDITS.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Cc: Jens Osterkamp <jens@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | CREDITS | 4 | ||||
-rw-r--r-- | MAINTAINERS | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B | |||
2740 | S: Valladolid 47009 | 2740 | S: Valladolid 47009 |
2741 | S: Spain | 2741 | S: Spain |
2742 | 2742 | ||
2743 | N: Jens Osterkamp | ||
2744 | E: jens@de.ibm.com | ||
2745 | D: Maintainer of Spidernet network driver for Cell | ||
2746 | |||
2743 | N: Gadi Oxman | 2747 | N: Gadi Oxman |
2744 | E: gadio@netvision.net.il | 2748 | E: gadio@netvision.net.il |
2745 | D: Original author and maintainer of IDE/ATAPI floppy/tape drivers | 2749 | 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/ | |||
9590 | 9590 | ||
9591 | SPIDERNET NETWORK DRIVER for CELL | 9591 | SPIDERNET NETWORK DRIVER for CELL |
9592 | M: Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 9592 | M: Ishizaki Kou <kou.ishizaki@toshiba.co.jp> |
9593 | M: Jens Osterkamp <jens@de.ibm.com> | ||
9594 | L: netdev@vger.kernel.org | 9593 | L: netdev@vger.kernel.org |
9595 | S: Supported | 9594 | S: Supported |
9596 | F: Documentation/networking/spider_net.txt | 9595 | F: Documentation/networking/spider_net.txt |