From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Apr 2018 16:37:12 +0000 (-0700)
Subject: Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=79a17dd9d2491443a0d03745adbb3d76ab97a356;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'staging-4.17-rc3' of git://git./linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are two staging driver fixups for 4.17-rc3.

  The first is the remaining stragglers of the irda code removal that
  you pointed out during the merge window. The second is a fix for the
  wilc1000 driver due to a patch that got merged in 4.17-rc1.

  Both of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
  staging: irda: remove remaining remants of irda code removal
---

79a17dd9d2491443a0d03745adbb3d76ab97a356