summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2019-02-21 20:16:10 +0100
committerHelge Deller <deller@gmx.de>2019-02-21 20:16:10 +0100
commit71d73a0b43c2b101a960c624290c8a053d174cac (patch)
tree08772bb50f7b4d63ae9473978f56ab5ea3667334 /MAINTAINERS
parentb7dc5a071ddf69c0350396b203cba32fe5bab510 (diff)
downloadlinux-71d73a0b43c2b101a960c624290c8a053d174cac.tar.gz
linux-71d73a0b43c2b101a960c624290c8a053d174cac.tar.bz2
linux-71d73a0b43c2b101a960c624290c8a053d174cac.zip
CREDITS/MAINTAINERS: Retire parisc-linux.org email domain
Retire the parisc-linux.org email domain and provide alternative email addresses for the remaining users, as agreed upon with them. Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 41ce5f4ad838..e6e17d8c5aae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -409,8 +409,7 @@ F: drivers/platform/x86/wmi.c
F: include/uapi/linux/wmi.h
AD1889 ALSA SOUND DRIVER
-M: Thibaut Varene <T-Bone@parisc-linux.org>
-W: http://wiki.parisc-linux.org/AD1889
+W: https://parisc.wiki.kernel.org/index.php/AD1889
L: linux-parisc@vger.kernel.org
S: Maintained
F: sound/pci/ad1889.*
@@ -11488,7 +11487,7 @@ F: Documentation/blockdev/paride.txt
F: drivers/block/paride/
PARISC ARCHITECTURE
-M: "James E.J. Bottomley" <jejb@parisc-linux.org>
+M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
M: Helge Deller <deller@gmx.de>
L: linux-parisc@vger.kernel.org
W: http://www.parisc-linux.org/