Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Nov 2009 19:17:24 +0000 (11:17 -0800)
1  2 
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/staging/strip/strip.c
net/mac80211/cfg.c
net/mac80211/ibss.c

Simple merge
Simple merge
Simple merge