Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	net/bluetooth/hci_core.c
	net/bluetooth/mgmt.c

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

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

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

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

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