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

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

drivers/net/wireless/iwlegacy/iwl-4965-tx.c

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

net/bluetooth/hci_core.c

net/bluetooth/hci_event.c

net/bluetooth/l2cap_core.c

net/bluetooth/sco.c

net/mac80211/cfg.c

net/mac80211/debugfs_netdev.c