Merge branch 'for-upstream/platform-x86_tpacpi' of git://repo.or.cz/linux-2.6/linux...

diff --combined drivers/platform/x86/Kconfig
index aef4f17cdfd471c6ae8fa521f1d293f17817e69d,11fce79b61d1636be6807045e6a900f1b08a1b2a..92161c7ff4b7b2b67fa193b63320fa7e902dc03f
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -59,8 -59,6 +59,8 @@@ config ASUS_LAPTO
        select NEW_LEDS
        select BACKLIGHT_CLASS_DEVICE
        depends on INPUT
 +      depends on RFKILL || RFKILL = n
 +      select INPUT_SPARSEKMAP
        ---help---
          This is the new Linux driver for Asus laptops. It may also support some
          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
@@@ -81,7 -79,6 +81,7 @@@ config DELL_LAPTO
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL || RFKILL = n
        depends on POWER_SUPPLY
 +      depends on SERIO_I8042
        default n
        ---help---
        This driver adds support for rfkill and backlight control to Dell
@@@ -322,9 -319,15 +322,15 @@@ config THINKPAD_ACPI_VIDE
          server running, phase of the moon, and the current mood of
          Schroedinger's cat.  If you can use X.org's RandR to control
          your ThinkPad's video output ports instead of this feature,
-         don't think twice: do it and say N here to save some memory.
+         don't think twice: do it and say N here to save memory and avoid
+         bad interactions with X.org.
  
-         If you are not sure, say Y here.
+         NOTE: access to this feature is limited to processes with the
+         CAP_SYS_ADMIN capability, to avoid local DoS issues in platforms
+         where it interacts badly with X.org.
+ 
+         If you are not sure, say Y here but do try to check if you could
+         be using X.org RandR instead.
  
  config THINKPAD_ACPI_HOTKEY_POLL
        bool "Support NVRAM polling for hot keys"