Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (112 commits)
  ACPI: fix build warning
  Revert "cpuidle: build fix for non-x86"
  ACPI: update intrd DSDT override console messages
  ACPI: update DSDT override documentation
  ACPI: Add "acpi_no_initrd_override" kernel parameter
  ACPI: its a directory not a folder....
  ACPI: misc cleanups
  ACPI: add missing prink prefix strings
  ACPI: cleanup acpi.h
  ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
  ACPI: video: Ignore ACPI video devices that aren't present in hardware
  ACPI: video: reset brightness on resume
  ACPI: video: call ACPI notifier chain for ACPI video notifications
  ACPI: create notifier chain to get hotkey events to graphics driver
  ACPI: video: delete unused display switch on hotkey event code
  ACPI: video: create "brightness_switch_enabled" modparam
  cpuidle: Add a poll_idle method
  ACPI: cpuidle: Support C1 idle time accounting
  ACPI: enable MWAIT for C1 idle
  ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
  ...

1 files changed, 19 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a372c86fd07b..aefd23f892ba 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
@@ -1790,6 +1804,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