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

author John W. Linville <linville@tuxdriver.com>

Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)

committer John W. Linville <linville@tuxdriver.com>

Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
author John W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
committer John W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
diff --cc include/uapi/linux/nl80211.h
Simple merge
diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/mlme.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
		1	2
include/uapi/linux/nl80211.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	patch \|	diff1 \|	diff2 \|	blob \| history