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/beacon.c

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

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

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

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

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

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

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

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

drivers/net/wireless/rndis_wlan.c

drivers/net/wireless/rt2x00/rt2400pci.c

drivers/net/wireless/rt2x00/rt2500pci.c

drivers/net/wireless/rt2x00/rt2800usb.c

drivers/net/wireless/rt2x00/rt2x00pci.c

drivers/net/wireless/rt2x00/rt61pci.c

drivers/net/wireless/rt2x00/rt73usb.c

drivers/net/wireless/wl12xx/wl1271_rx.c

include/net/mac80211.h

net/mac80211/key.c