]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 26 May 2015 16:20:34 +0000 (19:20 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 26 May 2015 16:20:57 +0000 (19:20 +0300)
commit9a1e12d9df916f71460319ee764755016eeb201b
tree9863c0473469c5b594ad0e5dab29d37b6900bdf8
parent2fd5125432815a41b1daabb942865567619b8d1e
parent10990dd8a874ba2b817817a06c3b12f55241ba5d
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-7000.c
drivers/net/wireless/iwlwifi/mvm/d3.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/pcie/trans.c