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: (119 commits)
  ACPI: don't pass handle for fixed hardware notifications
  ACPI: remove null pointer checks in deferred execution path
  ACPI: simplify deferred execution path
  acerhdf: additional BIOS versions
  acerhdf: convert to dev_pm_ops
  acerhdf: fix fan control for AOA150 model
  thermal: add missing Kconfig dependency
  acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
  hp-wmi: fix rfkill memory leak on unload
  ACPI: remove unnecessary #ifdef CONFIG_DMI
  ACPI: linux/acpi.h should not include linux/dmi.h
  hwmon driver for ACPI 4.0 power meters
  topstar-laptop: add new driver for hotkeys support on Topstar N01
  thinkpad_acpi: fix rfkill memory leak on unload
  thinkpad-acpi: report brightness events when required
  thinkpad-acpi: don't poll by default any of the reserved hotkeys
  thinkpad-acpi: Fix procfs hotkey reset command
  thinkpad-acpi: deprecate hotkey_bios_mask
  thinkpad-acpi: hotkey poll fixes
  thinkpad-acpi: be more strict when detecting a ThinkPad
  ...

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7ec7d88c5999..dd8729d674e5 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -60,7 +60,11 @@ config ACPI_PROCFS
           /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
           /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
           /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
-
+          /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)
+          /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/
+                cpufreq/*)
+          /proc/acpi/processor/*/throttling (/sys/class/thermal/
+                cooling_device*/*)
           This option has no effect on /proc/acpi/ files
           and functions which do not yet exist in /sys.
 
@@ -82,6 +86,17 @@ config ACPI_PROCFS_POWER
 
           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_SYSFS_POWER
         bool "Future power /sys interface"
         select POWER_SUPPLY