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

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

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

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

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

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

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

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

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

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

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

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

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

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/iwl-rx.c

drivers/net/wireless/libertas/cmd.c

drivers/net/wireless/libertas/if_sdio.c

drivers/net/wireless/rt2x00/rt2x00config.c

drivers/net/wireless/rt2x00/rt2x00dev.c