summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
committerJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
commit8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch)
treec4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /MAINTAINERS
parente82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff)
parentf4c109b660fa1d0453a6dde75bef725304687832 (diff)
downloadlinux-sh-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.gz
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts: drivers/hid/hid-thingm.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 0 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f148d3bdae7..96158b941dea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11314,11 +11314,6 @@ F: Documentation/thermal/cpu-cooling-api.txt
F: drivers/thermal/cpu_cooling.c
F: include/linux/cpu_cooling.h
-THINGM BLINK(1) USB RGB LED DRIVER
-M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
-S: Maintained
-F: drivers/hid/hid-thingm.c
-
THINKPAD ACPI EXTRAS DRIVER
M: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
L: ibm-acpi-devel@lists.sourceforge.net