Merge 'net-next/master'
authorKalle Valo <kvalo@codeaurora.org>
Sun, 6 Mar 2016 12:57:44 +0000 (14:57 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Sun, 6 Mar 2016 12:57:44 +0000 (14:57 +0200)
commit89ef41bfaa46f24a14b776f1cd78c0e0b39e54ce
tree8371cf24800fffa1d768767a8bf3e498a9edaa34
parent89916cc90a78fffbc4c3d7cb1f6540fb2e551804
parent00a1f0a93dea3cf1c141df79bfd06e7c9ee54162
Merge 'net-next/master'

Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/wil6210/cfg80211.c
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
drivers/net/wireless/realtek/rtlwifi/core.c