]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 22 Feb 2019 12:48:13 +0000 (13:48 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 22 Feb 2019 12:48:13 +0000 (13:48 +0100)
commitb7b14ec1ebef35d22f3f4087816468f22c987f75
tree3f99f4d7b770d7bba3ee84663b32f98dfbe7582d
parent77ff2c6b49843b01adef1f80abb091753e4c9c65
parent7a25c6c0aac85bbc50d3ce49cd08888adb14508b
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to resolve a conflict and to get the mac80211
rhashtable fixes so further patches can be applied on top.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
net/mac80211/util.c
net/wireless/core.h
net/wireless/nl80211.c
net/wireless/pmsr.c
net/wireless/util.c