]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:10:40 +0000 (14:10 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:10:40 +0000 (14:10 -0500)
commitf80d56049ab793b5045a02ddf63948c3e650f433
treecb4702d50bbe1d10ab9320ad3f63323b817727f7
parent9dcf9c8a9336c51cc84d54c735a498345e8421e3
parentfb462f00526eb00df3ec1c4ec5b6b7425f5fc3fa
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
drivers/net/wireless/iwlegacy/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rtlwifi/wifi.h
drivers/staging/brcm80211/sys/wl_mac80211.c
drivers/staging/brcm80211/sys/wlc_mac80211.c
net/mac80211/Kconfig