Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 20:05:51 +0000 (16:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 20:05:51 +0000 (16:05 -0400)
commitab3d59d265e772e734c36fe738809cb1a910f566
treeb6d29908d3d45b078d025341b1cc272ba4c0a6d0
parent42d36074e53eadfd79e6db518b5caf8fba914f8b
parent8c6e30936a7893a85f6222084f0f26aceb81137a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/scan.c
include/net/cfg80211.h
net/mac80211/ibss.c
net/mac80211/rx.c
net/mac80211/util.c
net/wireless/core.c
net/wireless/util.c