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

drivers/net/wireless/ath5k/ath5k.h

drivers/net/wireless/ath5k/base.c

drivers/net/wireless/ath5k/desc.c

drivers/net/wireless/ath9k/core.h

drivers/net/wireless/ath9k/main.c

drivers/net/wireless/ath9k/rc.c

drivers/net/wireless/ath9k/recv.c

drivers/net/wireless/ath9k/xmit.c

drivers/net/wireless/b43/debugfs.c

drivers/net/wireless/b43/debugfs.h

drivers/net/wireless/b43/main.c

drivers/net/wireless/b43/phy_common.c

drivers/net/wireless/b43/phy_g.c

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

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

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

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

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

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

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