Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

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

Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)

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

Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
author John W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
committer John W. Linville <linville@tuxdriver.com>
Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
diff --cc net/mac80211/util.c
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jul 2014 17:49:34 +0000 (13:49 -0400)
		1	2
net/mac80211/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	patch \|	diff1 \|	diff2 \|	blob \| history