Merge branch 'misc' into release

diff --combined drivers/platform/x86/Kconfig
index 431772b8a1d0579366c31706a267cf2681e0c87f,9e8f9485f9c97fc522e0bf7cc304a211957f024a..1a266d4ab5f18ec52d8451185adcf66a3cd892d6
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -54,6 -54,18 +54,18 @@@ config ASUS_LAPTO
  
          If you have an ACPI-compatible ASUS laptop, say Y or M here.
  
+ config DELL_LAPTOP
+       tristate "Dell Laptop Extras (EXPERIMENTAL)"
+       depends on X86
+       depends on DCDBAS
+       depends on EXPERIMENTAL
+       depends on BACKLIGHT_CLASS_DEVICE
+       depends on RFKILL
+       default n
+       ---help---
+       This driver adds support for rfkill and backlight control to Dell
+       laptops.
+ 
  config FUJITSU_LAPTOP
        tristate "Fujitsu Laptop Extras"
        depends on ACPI
@@@ -192,17 -204,6 +204,17 @@@ config THINKPAD_ACP
  
          If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
  
 +config THINKPAD_ACPI_DEBUGFACILITIES
 +      bool "Maintainer debug facilities"
 +      depends on THINKPAD_ACPI
 +      default n
 +      ---help---
 +        Enables extra stuff in the thinkpad-acpi which is completely useless
 +        for normal use.  Read the driver source to find out what it does.
 +
 +        Say N here, unless you were told by a kernel maintainer to do
 +        otherwise.
 +
  config THINKPAD_ACPI_DEBUG
        bool "Verbose debug mode"
        depends on THINKPAD_ACPI