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

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

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/iwlwifi/iwl3945-base.c

drivers/platform/x86/sony-laptop.c

include/net/wext.h

net/core/net-sysfs.c

net/mac80211/mlme.c

net/wireless/sme.c

net/wireless/wext-sme.c

net/wireless/wext.c