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:
  ACPI EC: remove redundant code
  ACPI: Add D3 cold state
  ACPI: processor: fix processor_physically_present in UP kernel
  ACPI: Split out custom_method functionality into an own driver
  ACPI: Cleanup custom_method debug stuff
  ACPI EC: enable MSI workaround for Quanta laptops
  ACPICA: Update to version 20110413
  ACPICA: Execute an orphan _REG method under the EC device
  ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place
  ACPICA: Update internal address SpaceID for DataTable regions
  ACPICA: Add more methods eligible for NULL package element removal
  ACPICA: Split all internal Global Lock functions to new file - evglock
  ACPI: EC: add another DMI check for ASUS hardware
  ACPI EC: remove dead code
  ACPICA: Fix code divergence of global lock handling
  ACPICA: Use acpi_os_create_lock interface
  ACPI: osl, add acpi_os_create_lock interface
  ACPI:Fix goto flows in thermal-sys

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/Makefile
index b66fbb2,cba0b23..ecb26b4
--- 1/drivers/acpi/Makefile
--- 2/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@@ -59,8 -59,10 +59,9 @@@ obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += ac
  obj-$(CONFIG_ACPI_BATTERY)    += battery.o
  obj-$(CONFIG_ACPI_SBS)                += sbshc.o
  obj-$(CONFIG_ACPI_SBS)                += sbs.o
 -obj-$(CONFIG_ACPI_POWER_METER)        += power_meter.o
  obj-$(CONFIG_ACPI_HED)                += hed.o
  obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o
+ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
  
  # processor has its own "processor." module_param namespace
  processor-y                   := processor_driver.o processor_throttling.o