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

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c
	net/mac80211/sta_info.c
	net/wireless/core.h

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.h
Simple merge

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

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

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

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

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