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

drivers/bluetooth/hci_ldisc.c

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

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

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

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

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

drivers/net/wireless/iwlwifi/iwl-eeprom.h

drivers/net/wireless/libertas/cfg.c

drivers/net/wireless/p54/p54usb.c

net/bluetooth/rfcomm/core.c

net/mac80211/ibss.c

net/mac80211/work.c