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)
1  2 
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