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

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

drivers/net/wireless/b43/dma.c

drivers/net/wireless/ipw2x00/ipw2100.c

drivers/net/wireless/ipw2x00/ipw2200.c

drivers/net/wireless/ipw2x00/libipw.h

drivers/net/wireless/ipw2x00/libipw_module.c

drivers/net/wireless/libertas/if_usb.c

drivers/net/wireless/rt2x00/rt73usb.c

net/mac80211/agg-tx.c

net/mac80211/cfg.c

net/mac80211/ht.c

net/mac80211/ibss.c

net/wireless/sme.c