]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Jul 2014 14:22:36 +0000 (10:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Jul 2014 14:22:36 +0000 (10:22 -0400)
commit411d86cb8a77b3b816b719e43458fd130a066659
tree5d5aa1964a1f97cb978a33b3533134ee624f90b6
parente5cb2cf90d88b2146b520846cbf57bd85e2dc86d
parentff9d35e52d8c1af79afbf3640d2011119598ac24
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/cfg.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/xmit.c
net/mac80211/sta_info.c
net/mac80211/tx.c
net/wireless/trace.h