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

MAINTAINERS

drivers/net/wireless/hostap/hostap_cs.c

drivers/net/wireless/hostap/hostap_hw.c

drivers/net/wireless/hostap/hostap_wlan.h

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

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

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

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

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

drivers/net/wireless/libertas_tf/main.c

drivers/net/wireless/p54/p54pci.c

net/mac80211/mlme.c

net/mac80211/work.c