diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-05 17:30:58 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-05 17:30:58 -1000 |
commit | ee946c36be21dcfe044f1c432cd6c6a33682e244 (patch) | |
tree | fb32f8bf520d78e89be822fc1ffea796f36167c7 /drivers/nfc/nfcsim.c | |
parent | 8e95cb336d5293704d6b31f73639d029c7d2c252 (diff) | |
parent | 7fe3fa3b5ec8e75389cce4bf5d052a52e6198d59 (diff) | |
download | linux-ee946c36be21dcfe044f1c432cd6c6a33682e244.tar.bz2 |
Merge tag 'platform-drivers-x86-v4.17-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver fixes from Darren Hart:
- We missed a case in the Dell config dependencies resulting in a
possible bad configuration, resolve it by giving up on trying to keep
DELL_LAPTOP visible in the menu and make it depend on DELL_SMBIOS.
- Fix a null pointer dereference at module unload for the asus-wireless
driver.
* tag 'platform-drivers-x86-v4.17-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: Kconfig: Fix dell-laptop dependency chain.
platform/x86: asus-wireless: Fix NULL pointer dereference
Diffstat (limited to 'drivers/nfc/nfcsim.c')
0 files changed, 0 insertions, 0 deletions