diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
| commit | 437cb0dbd104a1564e0e78f0d486b97677f80909 (patch) | |
| tree | e066b3d65eb965ca68ecc8ef14581f2450ad3a61 /MAINTAINERS | |
| parent | 139f37f5e14cd883eee2a8a36289f544b5390a44 (diff) | |
| parent | 987dfbaa65b2c3568b85e29d2598da08a011ee09 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2e94220898d7..29801f760b6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -223,10 +223,8 @@ S: Maintained F: drivers/platform/x86/acerhdf.c ACER WMI LAPTOP EXTRAS -M: Carlos Corbacho <carlos@strangeworlds.co.uk> -L: aceracpi@googlegroups.com (subscribers-only) +M: Joey Lee <jlee@novell.com> L: platform-driver-x86@vger.kernel.org -W: http://code.google.com/p/aceracpi S: Maintained F: drivers/platform/x86/acer-wmi.c @@ -271,10 +269,8 @@ S: Supported F: drivers/acpi/video.c ACPI WMI DRIVER -M: Carlos Corbacho <carlos@strangeworlds.co.uk> L: platform-driver-x86@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ -S: Maintained +S: Orphan F: drivers/platform/x86/wmi.c AD1889 ALSA SOUND DRIVER @@ -3033,9 +3029,8 @@ S: Maintained F: drivers/net/wireless/hostap/ HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER -M: Carlos Corbacho <carlos@strangeworlds.co.uk> L: platform-driver-x86@vger.kernel.org -S: Odd Fixes +S: Orphan F: drivers/platform/x86/tc1100-wmi.c HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series |