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/ath9k/ar9002_calib.c

drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h

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

drivers/net/wireless/ath/ath9k/htc.h

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

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

drivers/net/wireless/iwmc3200wifi/netdev.c

drivers/net/wireless/rt2x00/rt2x00firmware.c

include/linux/ieee80211.h

net/mac80211/agg-rx.c

net/mac80211/main.c