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)
commitf6d773cd4f3c18c40ab25a5cb92453756237840e
tree5631a6ea4495ae2eb5058fb63b25dea3b197d61b
parentd0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4
parentbcb628d579a61d0ab0cac4c6cc8a403de5254920
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/staging/strip/strip.c
net/mac80211/cfg.c
net/mac80211/ibss.c