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

drivers/bluetooth/btusb.c

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/ipw2x00/libipw_module.c

drivers/net/wireless/iwlwifi/iwl3945-base.c

drivers/net/wireless/libertas/cfg.c

drivers/net/wireless/libertas/dev.h

drivers/net/wireless/libertas/main.c

net/bluetooth/hci_event.c

net/bluetooth/hidp/Kconfig

net/bluetooth/l2cap.c

net/bluetooth/rfcomm/core.c