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

author John W. Linville <[email protected]>

Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)

committer John W. Linville <[email protected]>

Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
author John W. Linville <[email protected]>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
committer John W. Linville <[email protected]>
Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
diff --cc drivers/net/wireless/airo.c
Simple merge
diff --cc net/mac80211/main.c
Simple merge
author	John W. Linville <[email protected]>
	Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
committer	John W. Linville <[email protected]>
	Fri, 1 Oct 2010 15:12:36 +0000 (11:12 -0400)
		1	2
drivers/net/wireless/airo.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	patch \|	diff1 \|	diff2 \|	blob \| history