• Linus Torvalds's avatar
    Merge tag 'platform-drivers-x86-v3.17-1' of... · 0e03f98c
    Linus Torvalds authored
    Merge tag 'platform-drivers-x86-v3.17-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
    Pull x86 platform drivers fixes from Darren Hart:
     "This is my first pull request since taking on maintenance for the
      platform-drivers-x86 tree from Matthew Garrett.  These have passed my
      build testing and been run through Fengguang's LKP tests.  Due to
      timing this round, these have not spent any time in linux-next.  I
      have asked Stephen to include my for-next branch in linux-next going
      forward, once he's back from vacation.
      Details from tag:
       - toshiba_acpi: re-enable hotkeys and cleanups
       - ideapad-laptop: revert touchpad disable, and cleanup static/const
       - MAINTAINERS: update platform-drivers-x86 maintainer and tree"
    * tag 'platform-drivers-x86-v3.17-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
      toshiba_acpi: fix and cleanup toshiba_kbd_bl_mode_store()
      platform/x86: toshiba: re-enable acpi hotkeys after suspend to disk
      ideapad-laptop: Constify DMI table for real!
      Revert "ideapad-laptop: Disable touchpad interface on Yoga models"
      MAINTAINERS: Update platform-drivers-x86 maintainer and tree