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

drivers/net/wireless/airo.c

drivers/net/wireless/ath/ar9170/ar9170.h

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

drivers/net/wireless/ath/ar9170/usb.c

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

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

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

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

drivers/net/wireless/rt2x00/rt2800pci.c

drivers/net/wireless/rt2x00/rt2x00soc.c

drivers/net/wireless/rt2x00/rt73usb.c

drivers/net/wireless/zd1211rw/zd_mac.c

include/linux/rfkill.h

include/net/mac80211.h

net/mac80211/mlme.c

net/mac80211/rate.h

net/rfkill/input.c