]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaab935488fe8a1663b650a6dcdf0f54528951675
tree5d9eff61123f096e2434a9d36e6fdbd4cc5c6292
parentf408ef48c75525a06e3d372b3978d0dff4b628eb
parent5807c8da34683c9e155e0abe060e4f46c4339d21
Merge branch 'master' of git://git.kernel.org/pub/scm/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