Merge branch 'master' of...

drivers/bluetooth/ath3k.c

drivers/bluetooth/bcm203x.c

drivers/bluetooth/bfusb.c

drivers/net/wireless/ath/ath9k/ar9002_calib.c

drivers/net/wireless/ath/ath9k/ar9003_calib.c

drivers/net/wireless/ath/ath9k/ar9003_phy.h

drivers/net/wireless/ath/ath9k/ar9485_initvals.h

drivers/net/wireless/ath/ath9k/hw.c

drivers/net/wireless/ath/carl9170/tx.c

drivers/net/wireless/b43/xmit.c

drivers/net/wireless/iwlwifi/iwl-core.c

drivers/net/wireless/iwlwifi/iwl-pci.c

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

drivers/net/wireless/libertas/cfg.c

drivers/net/wireless/libertas/cfg.h

drivers/net/wireless/libertas/main.c

include/net/bluetooth/rfcomm.h

include/net/mac80211.h

net/bluetooth/hci_core.c

net/bluetooth/mgmt.c