diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-15 19:42:19 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-15 19:42:19 -1000 |
| commit | e05d2ba145fc43479bc52eb6dabef69721da39a5 (patch) | |
| tree | b49426669148ac86c849905f0303ff8121710119 /net/unix/af_unix.c | |
| parent | abd38301639f4fa2e63dae75346c1f0d847d0dfa (diff) | |
| parent | 25789f95a8834d154e5c1f0c9df9a7faedeae98e (diff) | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions