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

drivers/net/wireless/adm8211.c

drivers/net/wireless/airo.c

drivers/net/wireless/arlan-main.c

drivers/net/wireless/arlan.h

drivers/net/wireless/ath5k/base.c

drivers/net/wireless/ath5k/hw.c

drivers/net/wireless/atmel.c

drivers/net/wireless/b43/b43.h

drivers/net/wireless/b43/lo.c

drivers/net/wireless/b43/main.c

drivers/net/wireless/b43/nphy.c

drivers/net/wireless/b43/phy.c

drivers/net/wireless/b43/xmit.c

drivers/net/wireless/b43legacy/b43legacy.h

drivers/net/wireless/b43legacy/main.c

drivers/net/wireless/b43legacy/phy.c

drivers/net/wireless/b43legacy/radio.c

drivers/net/wireless/b43legacy/xmit.c

drivers/net/wireless/iwlwifi/Kconfig

drivers/net/wireless/iwlwifi/Makefile