Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c

1  2 
drivers/net/wireless/mwifiex/main.c
net/mac80211/iface.c
net/wireless/chan.c
net/wireless/util.c

Simple merge
Simple merge
Simple merge
Simple merge