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

MAINTAINERS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/ipw2x00/ipw2100.c

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

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

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