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

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

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

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

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

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

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

drivers/net/wireless/wl1251/main.c

drivers/ssb/pcmcia.c

net/mac80211/cfg.c

net/mac80211/ieee80211_i.h

net/mac80211/status.c

net/mac80211/tx.c