Merge tag 'platform-drivers-x86-v4.17-2' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 May 2018 03:30:58 +0000 (17:30 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 May 2018 03:30:58 +0000 (17:30 -1000)
commitee946c36be21dcfe044f1c432cd6c6a33682e244
treefb32f8bf520d78e89be822fc1ffea796f36167c7
parent8e95cb336d5293704d6b31f73639d029c7d2c252
parent7fe3fa3b5ec8e75389cce4bf5d052a52e6198d59
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