Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

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

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

drivers/net/wireless/ath/ath9k/Kconfig

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

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

drivers/net/wireless/mwl8k.c

drivers/net/wireless/rt2x00/rt2800lib.c

drivers/net/wireless/rt2x00/rt2x00.h

drivers/net/wireless/rt2x00/rt2x00dev.c

drivers/net/wireless/rt2x00/rt2x00queue.c

drivers/net/wireless/zd1211rw/zd_mac.c

net/mac80211/iface.c

net/mac80211/rx.c

net/mac80211/tx.c

net/mac80211/util.c

net/mac80211/wme.c

net/mac80211/wme.h

net/wireless/reg.c