a92932b51
parent 9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563
parent 290eddc4b3661dc4dfa95d199e0be5788928b3b1
author John W. Linville <linville@tuxdriver.com> 1351006906 -0400
committer John W. Linville <linville@tuxdriver.com> 1351006906 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	net/mac80211/mlme.c
����� x