diff options
| author | Joe Perches <joe@perches.com> | 2015-06-30 14:59:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 19:45:00 -0700 |
| 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 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 <kou.ishizaki@toshiba.co.jp> -M: Jens Osterkamp <jens@de.ibm.com> L: netdev@vger.kernel.org S: Supported F: Documentation/networking/spider_net.txt |