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)
commit42775a34d23027b19e984956a539448f5e7ff075
treee344340c7f0aed4c8faf7534fabbc64607a8e784
parent433131ba03c511a84e1fda5669c70cf8b44702e1
parent4e3b3bcd81776527fa6f11624d68849de8c8802e
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/main.c
net/mac80211/iface.c
net/wireless/chan.c
net/wireless/util.c