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

author David S. Miller <davem@davemloft.net>

Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)

committer David S. Miller <davem@davemloft.net>

Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
author David S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
committer David S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
diff --cc drivers/net/wireless/rt2x00/rt2x00usb.c
Simple merge
diff --cc drivers/staging/strip/strip.c
Simple merge
diff --cc net/mac80211/cfg.c
Simple merge
diff --cc net/mac80211/ibss.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
		1	2
drivers/net/wireless/rt2x00/rt2x00usb.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/strip/strip.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	patch \|	diff1 \|	diff2 \|	blob \| history