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

drivers/net/wireless/ath5k/pcu.c

drivers/net/wireless/ath9k/ath9k.h

drivers/net/wireless/ath9k/beacon.c

drivers/net/wireless/ath9k/calib.c

drivers/net/wireless/ath9k/core.h

drivers/net/wireless/ath9k/debug.c

drivers/net/wireless/ath9k/eeprom.c

drivers/net/wireless/ath9k/hw.c

drivers/net/wireless/ath9k/hw.h

drivers/net/wireless/ath9k/initvals.h

drivers/net/wireless/ath9k/mac.c

drivers/net/wireless/ath9k/main.c

drivers/net/wireless/ath9k/phy.h

drivers/net/wireless/ath9k/rc.c

drivers/net/wireless/ath9k/recv.c

drivers/net/wireless/ath9k/reg.h

drivers/net/wireless/ath9k/xmit.c

drivers/net/wireless/b43legacy/debugfs.c

drivers/net/wireless/b43legacy/phy.c

drivers/net/wireless/ipw2x00/ipw2200.c