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

MAINTAINERS

drivers/net/wireless/ath/ath9k/hw.c

drivers/net/wireless/ath/ath9k/phy.h

drivers/net/wireless/b43/Kconfig

drivers/net/wireless/b43/b43.h

drivers/net/wireless/b43/main.c

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

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

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

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

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

include/linux/netdevice.h

net/mac80211/main.c

net/mac80211/work.c