Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 13:31:39 +0000 (09:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 13:31:39 +0000 (09:31 -0400)
commit6fe5468f452c0c40348ebd4e737758a842286ca8
treebefe5ab33c457a9e695b65be72600f383266e611
parentdeb09280cd72ceb8b0679490f076d0e9f30dd456
parent69a2bac8984c4e6dba78b330ed183fd580c65e99
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
14 files changed:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2800pci.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/offchannel.c
net/nfc/llcp/llcp.c
net/nfc/llcp/sock.c
net/wireless/sme.c