Merge tag 'platform-drivers-x86-v4.17-4' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2018 14:39:57 +0000 (09:39 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2018 14:39:57 +0000 (09:39 -0500)
Pull x86 platform driver fix from Andy Shevchenko:
 "Fix NULL pointer dereference in asus-wmi on rfkill cleanup.

  The effective change is just one new condition - two lines of code.
  But it required moving one static helper function, which is why the
  diff looks a bit bigger"

* tag 'platform-drivers-x86-v4.17-4' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: asus-wmi: Fix NULL pointer dereference


Trivial merge