]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1191a8a14fdf9a1cbffbf4a4d52ac2d2d9aa7f0b
treea107065393720b80664157a035b206576e834793
parent37d8268e3cc6093e1a959a436964b1db6868becc
parent5edb169d140817b062c0d3ce0eaf2f0c135f47da
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