]> 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, 20 Jul 2012 16:30:48 +0000 (12:30 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 20 Jul 2012 16:30:48 +0000 (12:30 -0400)
commit913cdf163cf3845c48822b9735bf2ecbbd28f27a
tree9b1d8ca6084012a02b302520bc26e5be65ba7b2a
parent1db793ffd64890617c97b4ec3c4d2218156fd283
parent454bc5901587cd19d51905071d11afb716501ce4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
15 files changed:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/sta_cmd.c
drivers/net/wireless/mwifiex/sta_cmdresp.c
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/ti/wlcore/tx.c
net/mac80211/rx.c
net/mac80211/scan.c
net/wireless/nl80211.c