Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 21 May 2014 09:49:38 +0000 (12:49 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 21 May 2014 09:49:38 +0000 (12:49 +0300)
commit0ccab3db2b3d045905e4336a407a370ae0342d49
treec9e9f6839419a850460e8eb74750c4ac28d142d1
parent53446699892b7a171128295a85014732b9a1796b
parent7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/utils.c