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

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

Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)

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

Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge
diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge
diff --cc net/mac80211/ibss.c
Simple merge
diff --cc net/mac80211/scan.c
Simple merge
diff --cc net/mac80211/status.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
		1	2
drivers/net/wireless/rt2x00/rt2800lib.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	patch \|	diff1 \|	diff2 \|	blob \| history