Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Oct 2012 15:41:46 +0000 (11:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 23 Oct 2012 15:41:46 +0000 (11:41 -0400)
commit9b34f40c20111ba658f88e1669598db494be1fbc
treebe98189b178ca63a44c09c8a5e92574a92932b51
parent9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563
parent290eddc4b3661dc4dfa95d199e0be5788928b3b1
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c
drivers/bcma/main.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
include/net/cfg80211.h
net/bluetooth/smp.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/sta_info.c
net/mac80211/util.c
net/wireless/mlme.c