]> 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)
commit3bba9fd10161136658982a1b4c448d0a6520354c
tree5d5aa1964a1f97cb978a33b3533134ee624f90b6
parent7271a40d74b1cc4fc1863f2b642aeab1bebb4167
parent0500d39a1bc7defa271cd093c5e89b6eee400366
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