Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jul 2011 21:51:16 +0000 (17:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jul 2011 21:51:16 +0000 (17:51 -0400)
commit41bf37117b47fc5ce2aae91f6a108e7e42e0b046
treed5c8f24075313edfe548256dd931527f1569921e
parent415b3334a21aa67806c52d1acf4e72e14f7f402f
parent6e6e8c510a84fe3237ef02b954e58cca6a3f4b1a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
14 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/libertas/tx.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/orinoco_cs.c
drivers/net/wireless/orinoco/spectrum_cs.c