Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
commit90c456fc795485cfcbede23a6598feeac7e6c284
tree497f668041fd161186d225ef1d0d68a35fffe66f
parent41f6fc10d38150f83d0706305c69e1e696cc3b33
parent1c4abec0baf25ffb92a28cc99d4231feeaa4d3f3
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/utils.c
drivers/net/wireless/iwlwifi/pcie/trans.c