Merge branches 'release' and 'wmi-2.6.25' into release

1 files changed, 19 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0885aa2b095a..0819a579005c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -202,6 +202,13 @@ L:	linux-scsi@vger.kernel.org
 W:      http://www.adaptec.com/
 S:      Supported
 
+ACER WMI LAPTOP EXTRAS
+P:      Carlos Corbacho
+M:      carlos@strangeworlds.co.uk
+L:      aceracpi@googlegroups.com (subscribers-only)
+W:      http://code.google.com/p/aceracpi
+S:      Maintained
+
 ACPI
 P:      Len Brown
 M:      len.brown@intel.com
@@ -252,6 +259,13 @@ L:	linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
 
+ACPI WMI DRIVER
+P:      Carlos Corbacho
+M:      carlos@strangeworlds.co.uk
+L:      linux-acpi@vger.kernel.org
+W:      http://www.lesswatts.org/projects/acpi/
+S:      Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -1785,6 +1799,11 @@ P:	Jaroslav Kysela
 M:      perex@perex.cz
 S:      Maintained
 
+HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
+P:      Carlos Corbacho
+M:      carlos@strangeworlds.co.uk
+S:      Odd Fixes
+
 HPET:   High Precision Event Timers driver (hpet.c)
 P:      Clemens Ladisch
 M:      clemens@ladisch.de