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:
  acer-wmi, tc1100-wmi: select ACPI_WMI
  ACPI: WMI: Improve Kconfig description
  ACPI: DMI: add Panasonic CF-52 and Thinpad X61
  ACPI: thermal: syntax, spelling, kernel-doc
  intel_menlo: build on X86 only
  ACPI: build WMI on X86 only
  ACPI: cpufreq: Print _PPC changes via cpufreq debug layer
  ACPI: add newline to printk

diff --combined drivers/misc/Kconfig
index 1941587a7aa2de78c62423cfedc86a06147665f8,4e7f0002ad5f8e2b4f72e0d9a5c0612a9a890c79..c143a86c2ea6f03b6379220a20e04d254ecc54be
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -13,15 -13,6 +13,15 @@@ menuconfig MISC_DEVICE
  
  if MISC_DEVICES
  
 +config ATMEL_PWM
 +      tristate "Atmel AT32/AT91 PWM support"
 +      depends on AVR32 || ARCH_AT91
 +      help
 +        This option enables device driver support for the PWM channels
 +        on certain Atmel prcoessors.  Pulse Width Modulation is used for
 +        purposes including software controlled power-efficent backlights
 +        on LCD displays, motor control, and waveform generation.
 +
  config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
        depends on X86 && PCI && INPUT && EXPERIMENTAL
@@@ -106,9 -97,9 +106,9 @@@ config ACER_WM
        depends on X86
        depends on EXPERIMENTAL
        depends on ACPI
-       depends on ACPI_WMI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
+       select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
          wireless radio and bluetooth control, and on some laptops,
@@@ -155,7 -146,7 +155,7 @@@ config TC1100_WM
        tristate "HP Compaq TC1100 Tablet WMI Extras"
        depends on X86 && !X86_64
        depends on ACPI
-       depends on ACPI_WMI
+       select ACPI_WMI
        ---help---
          This is a driver for the WMI extensions (wireless and bluetooth power
          control) of the HP Compaq TC1100 tablet.
@@@ -288,6 -279,7 +288,7 @@@ config ATMEL_SS
  config INTEL_MENLOW
        tristate "Thermal Management driver for Intel menlow platform"
        depends on ACPI_THERMAL
+       depends on X86
        ---help---
          ACPI thermal management enhancement driver on
          Intel Menlow platform.