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

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/ath/carl9170/fw.c

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

drivers/net/wireless/ath/carl9170/tx.c

drivers/net/wireless/libertas/if_sdio.c

drivers/net/wireless/libertas/if_spi.c

drivers/net/wireless/libertas/main.c

drivers/net/wireless/orinoco/main.c

drivers/net/wireless/orinoco/scan.c

drivers/net/wireless/orinoco/scan.h

net/mac80211/rx.c