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

drivers/net/wireless/adm8211.c

drivers/net/wireless/at76c50x-usb.c

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

drivers/net/wireless/ipw2x00/ipw2100.c

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/mac80211_hwsim.c

drivers/net/wireless/mwl8k.c

drivers/net/wireless/p54/eeprom.c

drivers/net/wireless/p54/fwio.c

drivers/net/wireless/p54/led.c

drivers/net/wireless/p54/p54pci.c