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

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

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

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

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

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

drivers/net/wireless/iwlegacy/iwl-3945-hw.h

drivers/net/wireless/iwlegacy/iwl-4965-hw.h

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

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

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

drivers/net/wireless/iwlegacy/iwl4965-base.c