Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

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

Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)

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

Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
author John W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
committer John W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge
diff --cc include/net/mac80211.h
Simple merge
diff --cc net/mac80211/cfg.c
Simple merge
diff --cc net/mac80211/mlme.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
		1	2
drivers/net/wireless/mac80211_hwsim.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	patch \|	diff1 \|	diff2 \|	blob \| history