summary refs log tree commit diff
path: root/drivers/net/wireless/intel/iwlwifi/iwl-config.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-23 21:14:30 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-23 21:14:30 -1000
commit36f20ee24b5dc510389394ed2bd36fbe23f8d962 (patch)
tree74b58927988c4a3a2a88ac5d131844a1a9dfbd53 /drivers/net/wireless/intel/iwlwifi/iwl-config.h
parent06c944005bc3bfe21fd5706120a2cf8eeee76284 (diff)
parentc6f9288ee460565b94994aaf3261318199c2a674 (diff)
downloadlinux-36f20ee24b5dc510389394ed2bd36fbe23f8d962.tar.gz
Merge tag 'platform-drivers-x86-v4.15-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver fixes from Darren Hart:
 "Fix two issues resulting from the dell-smbios refactoring and
  introduction of the dell-smbios-wmi dispatcher.

  The first ensures a proper error code is returned when kzalloc fails.

  The second avoids an issue in older Dell BIOS implementations which
  would fail if the more complex calls were made by limiting those
  platforms to the simple calls such as those used by the existing
  dell-laptop and dell-wmi drivers, preserving their functionality prior
  to the addition of the dell-smbios-wmi dispatcher"

* tag 'platform-drivers-x86-v4.15-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: dell-laptop: fix error return code in dell_init()
  platform/x86: dell-smbios-wmi: Disable userspace interface if missing hotfix
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-config.h')
0 files changed, 0 insertions, 0 deletions