From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 May 2018 03:30:58 +0000 (-1000)
Subject: Merge tag 'platform-drivers-x86-v4.17-2' of git://git.infradead.org/linux-platform... 
X-Git-Tag: v4.17-rc4~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ee946c36be21dcfe044f1c432cd6c6a33682e244;p=linux-2.6-block.git

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
---

ee946c36be21dcfe044f1c432cd6c6a33682e244