]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:23 +0000 (11:15 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:23 +0000 (11:15 +0300)
commitced36c06fc88c56001d9010c372d368cefbea7c5
tree2153b096952476812e4f5af8c4f9f9fbce1789de
parent346f4d1d26587a094092fbe2d9210ce8d4f930f2
parent4a755a8ef46d5779a596d6ad1b4ccc43b756832a
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
drivers/net/wireless/iwlwifi/iwl-fw.h
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c