Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Oct 2013 18:02:07 +0000 (14:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Oct 2013 18:02:07 +0000 (14:02 -0400)
commit9f96da4dd2ccf685b506a21104cb13b1aadd907a
tree5d9eff61123f096e2434a9d36e6fdbd4cc5c6292
parentccdbb6e96beca362db876d820ac1e560ff6d9579
parentb6b561c31d51db3dec0cb55412a5d7a1a2397521
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
13 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/mwifiex/wmm.c
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/rx.c
net/mac80211/trace.h
net/mac80211/util.c
net/wireless/nl80211.c