]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 05:14:20 +0000 (15:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 05:14:20 +0000 (15:14 +1000)
commitdb2d047d770f25002c6bf660c653ba0eec3c1ede
tree1d40d510b45e055f4726bdb57074777e74f367aa
parentd38d946af848375ddc2094fc4012855469af8d15
parent12e62d6f7ec475e546b40bece2045da15d6c21ef
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
18 files changed:
MAINTAINERS
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/iwlwifi/iwl-agn-ucode.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800usb.c
include/net/cfg80211.h
net/mac80211/agg-rx.c
net/mac80211/cfg.c
net/mac80211/iface.c
net/mac80211/mesh_pathtbl.c
net/mac80211/sta_info.c
net/wireless/core.c
net/wireless/reg.c