]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 18:11:55 +0000 (14:11 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 18:11:55 +0000 (14:11 -0400)
commit9f3ea95c015754d2319068a2d54ceba7357427fe
treee8a37cac291bb64fa3d85ac27df45f56d493f2cb
parentfbe11239ead13fcb7a9ca68556d2ae4681475f59
parent8d90168bff750185039c1c9736ca76f2aff4b725
Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
27 files changed:
drivers/bcma/main.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9002_calib.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ar9003_phy.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/carl9170/main.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlegacy/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
drivers/net/wireless/wl12xx/acx.c
drivers/net/wireless/wl12xx/sdio.c
include/net/cfg80211.h
net/mac80211/main.c
net/mac80211/sta_info.c
net/wireless/core.c
net/wireless/reg.c