diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:49:23 +0200 |
| commit | 8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch) | |
| tree | c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /MAINTAINERS | |
| parent | Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/u... (diff) | |
| parent | HID: hid-led: fix Delcom support on big endian systems (diff) | |
| download | linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.xz linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.zip | |
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts:
drivers/hid/hid-thingm.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
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 |