summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2013-04-29 16:17:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:14 -0700
commitc547146262e59a359eff78636ac498494f8688e7 (patch)
treeae7963d9d6ba221d4bb5a016e03482bc4fbdb2ec
parentbbbe96ed899e8ebde1a12d28f10461eb8bef1074 (diff)
downloadlinux-3.10-c547146262e59a359eff78636ac498494f8688e7.tar.gz
linux-3.10-c547146262e59a359eff78636ac498494f8688e7.tar.bz2
linux-3.10-c547146262e59a359eff78636ac498494f8688e7.zip
MAINTAINERS: i8k driver is orphan
Massimo Dal Zotto stopped maintaining the i8k driver several years ago, so move his name from MAINTAINERS to CREDITS. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Massimo Dal Zotto <dz@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS4
2 files changed, 5 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index afaa7cec6ea..206d0fcf07a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -761,6 +761,10 @@ S: Northampton
S: NN1 3QT
S: United Kingdom
+N: Massimo Dal Zotto
+E: dz@debian.org
+D: i8k Dell laptop SMM driver
+
N: Uwe Dannowski
E: Uwe.Dannowski@ira.uka.de
W: http://i30www.ira.uka.de/~dannowsk/
diff --git a/MAINTAINERS b/MAINTAINERS
index ed33afb20a5..e091c3952da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2444,9 +2444,7 @@ S: Maintained
F: drivers/platform/x86/dell-laptop.c
DELL LAPTOP SMM DRIVER
-M: Massimo Dal Zotto <dz@debian.org>
-W: http://www.debian.org/~dz/i8k/
-S: Maintained
+S: Orphan
F: drivers/char/i8k.c
F: include/uapi/linux/i8k.h