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/mac.h

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

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

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

drivers/net/wireless/b43/dma.c

drivers/net/wireless/b43/dma.h

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

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

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

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

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

drivers/net/wireless/iwmc3200wifi/iwm.h

drivers/net/wireless/libertas/scan.c

drivers/net/wireless/libertas_tf/main.c

drivers/net/wireless/orinoco/wext.c

drivers/net/wireless/rt2x00/rt2800usb.c

drivers/net/wireless/rtl818x/rtl8180_dev.c

drivers/net/wireless/wl12xx/wl1251_boot.c

drivers/net/wireless/wl12xx/wl1271_cmd.c