Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 25 Jun 2013 10:20:16 +0000 (12:20 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 25 Jun 2013 10:20:16 +0000 (12:20 +0200)
commit9277326e1e5d395397fbe20c0f310cf30bfbacc2
treedc60601afda52bf7059d0b06781a3b2cdf26ed96
parentcfb4e624314b657ea5831505a380d932f3313a7a
parent9fbdc75116f7a2b183464d42f3abccb616584105
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/dev.h
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/rs.c
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/rs.c