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)
13 files changed:
1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge