]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 02:56:24 +0000 (12:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 02:56:24 +0000 (12:56 +1000)
commit2e6dfff09319a7747d95bf1eb7a2fbb3ae374367
treee5a0fda200db2f5db44dea2b0ef7b083340c7aab
parentc6c80068cd1fdffe15348fc68659ac9e65fb555c
parent78f9c85035101317d4189cdb31c582f96854b182
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
14 files changed:
drivers/net/wireless/ath/ath5k/debug.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/iwlegacy/4965-rs.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/mac80211_hwsim.c
include/net/mac80211.h
net/mac80211/debugfs_netdev.c
net/mac80211/debugfs_sta.c
net/mac80211/mlme.c
net/wireless/nl80211.c