From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2015 04:41:02 +0000 (-0700)
Subject: Merge tag 'platform-drivers-x86-v4.3-2' of git://git.infradead.org/users/dvhart/linux... 
X-Git-Tag: android-x86-6.0-r1~678
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a7d5c189719846889c029c34e24e166a465368fa;p=android-x86%2Fkernel.git

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

Pull x86 platform driver fixes from Darren Hart:
 "Fix an issue introduced by the previous major toshiba rework.  Add a
  quirk.  Workaround a few platform specific firmware items.  One
  cleanup to wmi I inadvertently dropped from a previous pull request.

  Details:

  hp-wmi:
   - limit hotkey enable

  toshiba_acpi:
   - Fix hotkeys registration on some toshiba models
   - Fix USB Sleep and Music always disabled

  wmi:
   - Remove private %pUL implementation

  asus-nb-wmi:
   - Add wapf=4 quirk for X456UA/X456UF"

* tag 'platform-drivers-x86-v4.3-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  hp-wmi: limit hotkey enable
  toshiba_acpi: Fix hotkeys registration on some toshiba models
  toshiba_acpi: Fix USB Sleep and Music always disabled
  wmi: Remove private %pUL implementation
  asus-nb-wmi: Add wapf=4 quirk for X456UA/X456UF
---

a7d5c189719846889c029c34e24e166a465368fa