Merge branch 'sony-laptop' into release

diff --combined drivers/platform/x86/Kconfig
index d45c6ab729f8a9c48919303ad1c2ab0553662d78,36b1628d19c61abe10b3148bbd844354ece315f7..eb6908a6fe0b14dfa71fd29f430763b6b4917a40
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -165,6 -165,7 +165,7 @@@ config SONY_LAPTO
        depends on ACPI
        select BACKLIGHT_CLASS_DEVICE
        depends on INPUT
+       depends on RFKILL
          ---help---
          This mini-driver drives the SNC and SPIC devices present in the ACPI
          BIOS of the Sony Vaio laptops.
@@@ -226,30 -227,6 +227,30 @@@ config THINKPAD_ACPI_DEBU
  
          If you are not sure, say N here.
  
 +config THINKPAD_ACPI_UNSAFE_LEDS
 +      bool "Allow control of important LEDs (unsafe)"
 +      depends on THINKPAD_ACPI
 +      default n
 +      ---help---
 +        Overriding LED state on ThinkPads can mask important
 +        firmware alerts (like critical battery condition), or misled
 +        the user into damaging the hardware (undocking or ejecting
 +        the bay while buses are still active), etc.
 +
 +        LED control on the ThinkPad is write-only (with very few
 +        exceptions on very ancient models), which makes it
 +        impossible to know beforehand if important information will
 +        be lost when one changes LED state.
 +
 +        Users that know what they are doing can enable this option
 +        and the driver will allow control of every LED, including
 +        the ones on the dock stations.
 +
 +        Never enable this option on a distribution kernel.
 +
 +        Say N here, unless you are building a kernel for your own
 +        use, and need to control the important firmware LEDs.
 +
  config THINKPAD_ACPI_DOCK
        bool "Legacy Docking Station Support"
        depends on THINKPAD_ACPI