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

MAINTAINERS

drivers/net/wireless/ath/ath5k/base.c

drivers/net/wireless/ath/ath5k/phy.c

drivers/net/wireless/hostap/hostap_hw.c

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

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

drivers/net/wireless/iwlwifi/iwl-agn-tx.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/iwl3945-base.c

drivers/net/wireless/p54/p54usb.c

drivers/net/wireless/wl12xx/wl1251_sdio.c

net/mac80211/driver-ops.h

net/mac80211/mlme.c

net/mac80211/rx.c