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

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (47 commits)
  ACPI: pci_link: remove acpi_irq_balance_set() interface
  fujitsu-laptop: Add DMI callback for Lifebook S6420
  ACPI: EC: Don't do transaction from GPE handler in poll mode.
  ACPI: EC: lower interrupt storm treshold
  ACPICA: Use spinlock for acpi_{en|dis}able_gpe
  ACPI: EC: restart failed command
  ACPI: EC: wait for last write gpe
  ACPI: EC: make kernel messages more useful when GPE storm is detected
  ACPI: EC: revert msleep patch
  thinkpad_acpi: fingers off backlight if video.ko is serving this functionality
  sony-laptop: fingers off backlight if video.ko is serving this functionality
  msi-laptop: fingers off backlight if video.ko is serving this functionality
  fujitsu-laptop: fingers off backlight if video.ko is serving this functionality
  eeepc-laptop: fingers off backlight if video.ko is serving this functionality
  compal: fingers off backlight if video.ko is serving this functionality
  asus-acpi: fingers off backlight if video.ko is serving this functionality
  Acer-WMI: fingers off backlight if video.ko is serving this functionality
  ACPI video: if no ACPI backlight support, use vendor drivers
  ACPI: video: Ignore devices that aren't present in hardware
  Delete an unwanted return statement at evgpe.c
  ...

diff --combined MAINTAINERS
index 53e78c8,dcbc868..272d04e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1879,37 -1879,6 +1879,37 @@@ M:    linux-kernel@vger.kernel.or
  W:    http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
  S:    Maintained
  
 +GSPCA FINEPIX SUBDRIVER
 +P:    Frank Zago
 +M:    frank@zago.net
 +L:    video4linux-list@redhat.com
 +S:    Maintained
 +
 +GSPCA M5602 SUBDRIVER
 +P:    Erik Andren
 +M:    erik.andren@gmail.com
 +L:    video4linux-list@redhat.com
 +S:    Maintained
 +
 +GSPCA PAC207 SONIXB SUBDRIVER
 +P:    Hans de Goede
 +M:    hdegoede@redhat.com
 +L:    video4linux-list@redhat.com
 +S:    Maintained
 +
 +GSPCA T613 SUBDRIVER
 +P:    Leandro Costantino
 +M:    lcostantino@gmail.com
 +L:    video4linux-list@redhat.com
 +S:    Maintained
 +
 +GSPCA USB WEBCAM DRIVER
 +P:    Jean-Francois Moine
 +M:    moinejf@free.fr
 +W:    http://moinejf.free.fr
 +L:    video4linux-list@redhat.com
 +S:    Maintained
 +
  HARDWARE MONITORING
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
@@@ -2216,6 -2185,13 +2216,13 @@@ M:    adaplas@gmail.co
  L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  
+ INTEL MENLOW THERMAL DRIVER
+ P:    Sujith Thomas
+ M:    sujith.thomas@intel.com
+ L:    linux-acpi@vger.kernel.org
+ W:    http://www.lesswatts.org/projects/acpi/
+ S:    Supported
+ 
  INTEL IA32 MICROCODE UPDATE SUPPORT
  P:    Tigran Aivazian
  M:    tigran@aivazian.fsnet.co.uk
@@@ -3377,7 -3353,9 +3384,9 @@@ S:      Maintaine
  
  PNP SUPPORT
  P:    Adam Belay
- M:    ambx1@neo.rr.com
+ M:    abelay@mit.edu
+ P:    Bjorn Helgaas
+ M:    bjorn.helgaas@hp.com
  S:    Maintained
  
  PNXxxxx I2C DRIVER