diff options
author | Len Brown <len.brown@intel.com> | 2007-02-17 00:52:41 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-17 00:52:41 +0100 |
commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /MAINTAINERS | |
parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
parent | ACPI: bay: use IS_ERR for return of register_platform_device_simple (diff) | |
download | linux-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.xz linux-81450b73dde07f473a4a7208b209b4c8b7251d90.zip |
Pull misc-for-upstream into release branch
Conflicts:
drivers/usb/misc/appledisplay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b0fd71b3f66f..5a546e594567 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -247,6 +247,13 @@ L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported +ACPI VIDEO DRIVER +P: Luming Yu +M: luming.yu@intel.com +L: linux-acpi@vger.kernel.org +W: http://acpi.sourceforge.net/ +S: Supported + AD1816 SOUND DRIVER P: Thorsten Knabe M: Thorsten Knabe <linux@thorsten-knabe.de> |