]> 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)
commitdbf7608c62d6a9236cfd8ce1dd39d108f0d2e59a
treec9e9f6839419a850460e8eb74750c4ac28d142d1
parent2cd55bb098f7c631a9cabbc8596cb12c7f0e53d9
parent5c16695ddb10ab2d4fc5874b6da9f3f36a0ca06f
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