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/ar9003_2p2_initvals.h

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

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

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

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

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

drivers/net/wireless/ath/carl9170/cmd.h

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

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

drivers/net/wireless/b43/phy_n.c

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

drivers/net/wireless/wl1251/Makefile

net/mac80211/ibss.c

net/mac80211/main.c

net/mac80211/rate.c

net/wireless/reg.c