Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux...

Pull x86 platform driver updates from Darren Hart:
 "Fairly routine update for platform-drivers-x86.

  Mostly fixes and cleanups, with a significant refactoring of toshiba*
  drivers.  Includes the addition of the dell-rbtn driver.

  Details:

  asus-wmi:
   - fan control

  dell*:
   - add Dell airplane mode switch driver

  ideapad-laptop:
   - platform rfkill fixes, and regression fix

  pvpanic:
   - handle missing _STA correctly

  toshiba*:
   - rafactor bluetooth support
   - haps documentation
   - driver cleanup

  other:
   - Use acpi_video_unregister_backlight instead of
     acpi_video_unregister in serveral drivers.
   - Orphan msi-wmi.

* tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (24 commits)
  MAINTAINERS: Orphan x86 driver msi-wmi
  ideapad: fix software rfkill setting
  dell-laptop: Use dell-rbtn instead i8042 filter when possible
  dell-rbtn: Export notifier for other kernel modules
  dell-rbtn: Dell Airplane Mode Switch driver
  samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister
  asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister
  apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister
  pvpanic: handle missing _STA correctly
  ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked
  asus-wmi: add fan control
  Documentation/ABI: Add file describing the sysfs entries for toshiba_haps
  toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros
  toshiba_haps: Replace sscanf with kstrtoint
  toshiba_acpi: Bump driver version to 0.22
  toshiba_acpi: Remove TOS_FAILURE check from some functions
  toshiba_acpi: Comments cleanup
  toshiba_acpi: Rename hci_{read, write}1 functions
  toshiba_acpi: Remove no longer needed hci_{read, write}2 functions
  toshiba_bluetooth: Change BT status message to debug
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/platform/x86/Kconfig
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/dell-laptop.c
index 01d081052b508b795580cfec441fa0f8201b7d75,83e3d7f9d923c34c71c5baa63adbf6af55d79900..35de903cb506b3bdf74dd0a3b265f944722b534d
--- 1/drivers/platform/x86/dell-laptop.c
--- 2/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@@ -31,8 -31,8 +31,9 @@@
  #include <linux/slab.h>
  #include <linux/debugfs.h>
  #include <linux/seq_file.h>
 +#include <acpi/video.h>
  #include "../../firmware/dcdbas.h"
+ #include "dell-rbtn.h"
  
  #define BRIGHTNESS_TOKEN 0x7d
  #define KBD_LED_OFF_TOKEN 0x01E1

diff --cc drivers/platform/x86/ideapad-laptop.c
index bea0228309443e1031607b09e0eef85e45b6011e,1bd34dbfe73a68a12f0f5d81b9361a299b1550fe..76b57388d01b5b73838bd3ab73741b5c096148d7
--- 1/drivers/platform/x86/ideapad-laptop.c
--- 2/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@@ -830,13 -830,13 +831,20 @@@ static void ideapad_acpi_notify(acpi_ha
   * report all radios as hardware-blocked.
   */
  static const struct dmi_system_id no_hw_rfkill_list[] = {
 +      {
 +              .ident = "Lenovo G40-30",
 +              .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 +                      DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
 +              },
 +      },
+       {
+               .ident = "Lenovo G50-30",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G50-30"),
+               },
+       },
        {
                .ident = "Lenovo Yoga 2 11 / 13 / Pro",
                .matches = {

diff --cc drivers/platform/x86/toshiba_acpi.c
Simple merge