]> 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)
commitc7d8faf799249f89dea1a4870917db61f8b22e16
treea107065393720b80664157a035b206576e834793
parent266065592758a452e107e97fef3cac8ff386a67a
parent9018e4918f032fa2ef331ddab1e62ad5b2d227dd
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