Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:35:42 +0000 (15:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:35:42 +0000 (15:35 -0400)
commit094daf7db7c47861009899ce23f9177d761e20b0
treea107065393720b80664157a035b206576e834793
parent3ed6f6958c0ac21958285d8648f14d34da4bbcb3
parent5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
drivers/net/wireless/libertas/main.c
drivers/net/wireless/mwifiex/main.c
include/linux/if_ether.h
net/mac80211/agg-rx.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/sta_info.c