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

drivers/net/wireless/Kconfig

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

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

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

drivers/net/wireless/b43/main.c

drivers/net/wireless/b43/phy_a.c

drivers/net/wireless/b43/phy_g.c

drivers/net/wireless/b43/phy_lp.c

drivers/net/wireless/b43/tables_lpphy.c

drivers/net/wireless/ipw2x00/Kconfig

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

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

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

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

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

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

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

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

drivers/net/wireless/iwmc3200wifi/cfg80211.c

drivers/net/wireless/iwmc3200wifi/commands.c