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

drivers/net/wireless/Kconfig

drivers/net/wireless/ath5k/ath5k.h

drivers/net/wireless/ath5k/base.c

drivers/net/wireless/ath5k/debug.c

drivers/net/wireless/ath5k/debug.h

drivers/net/wireless/ath5k/hw.c

drivers/net/wireless/ath5k/initvals.c

drivers/net/wireless/ath5k/phy.c

drivers/net/wireless/ath5k/reg.h

drivers/net/wireless/ipw2200.c

drivers/net/wireless/iwlwifi/iwl-3945.c

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

drivers/net/wireless/libertas/main.c

drivers/net/wireless/prism54/isl_ioctl.c

drivers/net/wireless/rt2x00/rt2500pci.c

drivers/net/wireless/rt2x00/rt2500usb.c

drivers/net/wireless/rt2x00/rt2x00.h

drivers/net/wireless/rt2x00/rt2x00config.c

drivers/net/wireless/rt2x00/rt2x00debug.c

drivers/net/wireless/rt2x00/rt2x00mac.c