Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Wed, 28 Mar 2018 08:57:34 +0000 (11:57 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 28 Mar 2018 08:57:34 +0000 (11:57 +0300)
commit6b7d5c0745905b71127d0c1ae6eeddc09bbdaad8
treea7d03535aff02b6088c19d6b6fba31bc97ae0157
parentc03a5aacde0c86f6dabab8f17a6d1911ee13b6c4
parent9b9322db5c5a1917a66c71fe47c3848a9a31227e
Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

Requested by Luca, needed for upcoming patch "iwlwifi: add a bunch of new 9000
PCI IDs".
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c