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

drivers/net/ps3_gelic_wireless.c

drivers/net/wireless/b43/Makefile

drivers/net/wireless/b43/nphy.h

drivers/net/wireless/ipw2200.c

drivers/net/wireless/ipw2200.h

drivers/net/wireless/iwlwifi/Kconfig

drivers/net/wireless/iwlwifi/Makefile

drivers/net/wireless/iwlwifi/iwl-3945-commands.h

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

drivers/net/wireless/iwlwifi/iwl-4965-commands.h

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

drivers/net/wireless/iwlwifi/iwl-4965-io.h

drivers/net/wireless/iwlwifi/iwl-4965-rs.c

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

drivers/net/wireless/iwlwifi/iwl-4965.h

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

drivers/net/wireless/iwlwifi/iwl-core.h

drivers/net/wireless/iwlwifi/iwl-debug.h

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

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