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

author John W. Linville <[email protected]>

Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)

committer John W. Linville <[email protected]>

Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
author John W. Linville <[email protected]>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
committer John W. Linville <[email protected]>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
diff --cc net/mac80211/status.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge
author	John W. Linville <[email protected]>
	Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
committer	John W. Linville <[email protected]>
	Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
		1	2
net/mac80211/status.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	patch \|	diff1 \|	diff2 \|	blob \| history