Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f526e735c5ab..cd2ee6fce1b4 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -59,6 +59,8 @@ config ASUS_LAPTOP
         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
@@ -79,6 +81,7 @@ config DELL_LAPTOP
         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
@@ -176,6 +179,7 @@ config COMPAL_LAPTOP
         tristate "Compal Laptop Extras"
         depends on ACPI
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on RFKILL
         ---help---
           This is a driver for laptops built by Compal:
 
@@ -319,9 +323,15 @@ config THINKPAD_ACPI_VIDEO
           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.
+
+          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.
+          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"