]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'iwlwifi-for-kalle-2015-12-16' into next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
commita510effb168f016160113706081399d98c87c124
tree31d2614a4c2cfc72a321283ee245f70a2a4bf2b5
parent47ee5443b020457a0767bae53d06f20cfbe87fef
parentf5d445eeaee45d84bfff3a659e44b5254de5a3b1
Merge tag 'iwlwifi-for-kalle-2015-12-16' into next

* don't load firmware that won't exist for 7260
* fix RCU splat
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c