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

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

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

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

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

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

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

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

drivers/net/wireless/b43/sdio.c

drivers/net/wireless/libertas/if_sdio.c

net/mac80211/debugfs_key.c

net/mac80211/main.c