Merge branch 'master' of...

drivers/bluetooth/ath3k.c

drivers/bluetooth/btmrvl_drv.h

drivers/bluetooth/btmrvl_main.c

drivers/bluetooth/btmrvl_sdio.c

drivers/bluetooth/btusb.c

drivers/net/wireless/airo.c

drivers/net/wireless/ath/ath5k/base.c

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

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

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

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

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

drivers/net/wireless/mwifiex/cfg80211.c

drivers/net/wireless/mwifiex/txrx.c

drivers/net/wireless/ti/wl1251/acx.c

drivers/net/wireless/ti/wl1251/event.c

drivers/net/wireless/ti/wl1251/spi.c

net/bluetooth/l2cap_core.c

net/bluetooth/mgmt.c