From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jun 2016 05:42:19 +0000 (-1000)
Subject: Merge tag 'platform-drivers-x86-v4.7-2' of git://git.infradead.org/users/dvhart/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e05d2ba145fc43479bc52eb6dabef69721da39a5;p=openwrt%2Fstaging%2Fblogic.git

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

Pull x86 platform driver fixes from Darren Hart:
 "Minor kconfig dependency cleanup, trivial mic mute hotkey for ideapad,
  and a needed improvement in adaptive keyboard detection for thinkpad:

  platform/x86:
   - Drop duplicate dependencies on X86

  thinkpad_acpi:
   - Add support for HKEY version 0x200

  ideapad_laptop:
   - Add an event for mic mute hotkey"

* tag 'platform-drivers-x86-v4.7-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform/x86: Drop duplicate dependencies on X86
  thinkpad_acpi: Add support for HKEY version 0x200
  ideapad_laptop: Add an event for mic mute hotkey
---

e05d2ba145fc43479bc52eb6dabef69721da39a5