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 --combined drivers/acpi/Kconfig
index bc2218db5ba9b2661e1f0f1261be48a354973efb,d918e130bef37340fe07813878e556b6176a610f..de0e3df767762220a670aa640c47029ba72603ff
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -73,6 -73,17 +73,6 @@@ config ACPI_PROCFS_POWE
  
          Say N to delete power /proc/acpi/ directories that have moved to /sys/
  
 -config ACPI_POWER_METER
 -      tristate "ACPI 4.0 power meter"
 -      depends on HWMON
 -      help
 -        This driver exposes ACPI 4.0 power meters as hardware monitoring
 -        devices.  Say Y (or M) if you have a computer with ACPI 4.0 firmware
 -        and a power meter.
 -
 -        To compile this driver as a module, choose M here:
 -        the module will be called power-meter.
 -
  config ACPI_EC_DEBUGFS
        tristate "EC read/write access through /sys/kernel/debug/ec"
        default n
@@@ -369,6 -380,21 +369,21 @@@ config ACPI_HE
          which is used to report some hardware errors notified via
          SCI, mainly the corrected errors.
  
+ config ACPI_CUSTOM_METHOD
+       tristate "Allow ACPI methods to be inserted/replaced at run time"
+       depends on DEBUG_FS
+       default n
+       help
+         This debug facility allows ACPI AML methods to me inserted and/or
+         replaced without rebooting the system. For details refer to:
+         Documentation/acpi/method-customizing.txt.
+ 
+         NOTE: This option is security sensitive, because it allows arbitrary
+         kernel memory to be written to by root (uid=0) users, allowing them
+         to bypass certain security measures (e.g. if root is not allowed to
+         load additional kernel modules after boot, this feature may be used
+         to override that restriction).
+ 
  source "drivers/acpi/apei/Kconfig"
  
  endif # ACPI

diff --combined drivers/acpi/Makefile
index b66fbb2fc85fed5d414d57e7faa68676c1dfd5e7,cba0b2334b9b83cc653a3670199d4de64557c659..ecb26b4f29a0581d697a26c69fa9b52532e0f327
--- 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