Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 17 Oct 2011 19:05:26 +0000 (15:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 17 Oct 2011 19:05:26 +0000 (15:05 -0400)
commit41ebe9cde738a972d05c7282e09f5ed54cff0e8d
tree223bf0feb7305e46989b60c3f070bef87d5fcab4
parentfd38f734cb8200529e281338514945fcbff2364b
parent5c1381ac3f3f49ab1e0886ea8f1432c9a5def519
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
drivers/net/wireless/libertas/main.c
drivers/net/wireless/mwifiex/main.c
net/mac80211/cfg.c
net/mac80211/sta_info.c