Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	drivers/net/wireless/iwlwifi/pcie/tx.c

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

diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cmdevt.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sdio.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/nfc/pn533.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/bluetooth/smp.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/scan.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/status.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/nfc/llcp/llcp.c
Simple merge