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

diff --cc drivers/net/wireless/iwlwifi/Kconfig
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-7000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-8000.c
Simple merge

diff --cc include/net/bluetooth/hci_core.h
Simple merge

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

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

diff --cc net/ieee802154/6lowpan_rtnl.c
Simple merge

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

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

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

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

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

diff --cc net/mac802154/wpan.c
Simple merge