Merge 'net-next/master'

Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtlwifi/core.c
Simple merge