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

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

drivers/net/wireless/b43/dma.c

drivers/net/wireless/b43/dma.h

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

drivers/net/wireless/p54/p54usb.c

drivers/net/wireless/rt2x00/rt2x00dev.c

drivers/net/wireless/rtlwifi/efuse.c

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c

drivers/net/wireless/rtlwifi/usb.c

drivers/net/wireless/wl12xx/sdio.c

drivers/net/wireless/wl12xx/spi.c

drivers/net/wireless/wl12xx/testmode.c

drivers/net/wireless/zd1211rw/zd_usb.c

drivers/net/wireless/zd1211rw/zd_usb.h

include/net/mac80211.h

net/mac80211/rx.c