Skip to content
  • Linus Torvalds's avatar
    Merge tag 'platform-drivers-x86-v4.1-1' of... · 78d42567
    Linus Torvalds authored
    Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
    
    Pull x86 platform driver updates from Darren Hart:
     "This series includes significant updates to the toshiba_acpi driver
      and the reintroduction of the dell-laptop keyboard backlight additions
      I had to revert previously.  Also included are various fixes for
      typos, warnings, correctness, and minor bugs.
    
      Specifics:
    
      dell-laptop:
         - add support for keyboard backlight.
    
      toshiba_acpi:
         - adaptive keyboard, hotkey, USB sleep and charge, and backlight
           updates.  Update sysfs documentation.
    
      toshiba_bluetooth:
         - fix enabling/disabling loop on recent devices
    
      apple-gmux:
         - lock iGP IO to protect from vgaarb changes
    
      other:
         - Fix typos, clear gcc warnings, clarify pr_* messages, correct
           return types, update MAINTAINERS"
    
    * tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
      toshiba_acpi: Do not register vendor backlight when acpi_video bl is available
      MAINTAINERS: Add me on list of Dell laptop drivers
      platform: x86: dell-laptop: Add support for keyboard backlight
      Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
      toshiba_acpi: Fix pr_* messages from USB Sleep Functions
      toshiba_acpi: Update and fix USB Sleep and Charge modes
      wmi: Use bool function return values of true/false not 1/0
      toshiba_bluetooth: Fix enabling/disabling loop on recent devices
      toshiba_bluetooth: Clean up *_add function and disable BT device at removal
      toshiba_bluetooth: Add three new functions to the driver
      toshiba_acpi: Fix the enabling of the Special Functions
      toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
      toshiba_acpi: Add Hotkey Event Type function and definitions
      x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
      apple-gmux: lock iGP IO to protect from vgaarb changes
      MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
      toshiba_acpi: Update events in toshiba_acpi_notify
      intel-oaktrail: Fix trivial typo in comment
      thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
      thinkpad_acpi: signedness bugs getting current_mode
      ...
    78d42567