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)
commit9a244409d0b0cf3b1e46f1dc331f2c718597fae0
tree5d5aa1964a1f97cb978a33b3533134ee624f90b6
parentbac9832076ee3b134bc859e07698c99276fc9459
parentc01fac1c77a00227f706a1654317023e3f4ac7f0
Merge branch 'master' of git://git./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