]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdb37dc99d7cfcd006d75f8f34a0147934cba076e
treec9e9f6839419a850460e8eb74750c4ac28d142d1
parent80c735f3d49de41daf52691c33c619326adf72b7
parentbc6e65ed9d34b782977b43374fd4ff0d0b3441c8
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