Merge tag 'iwlwifi-for-kalle-2016-01-26_2' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Wed, 27 Jan 2016 12:19:18 +0000 (14:19 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 27 Jan 2016 12:19:18 +0000 (14:19 +0200)
commitf9ead9beef3f44be0db4b542a8c2ce698fb1530e
tree0b84be722cb6059b1624ceb69a9cb31217e5f7e1
parent36efee8e9ccb60ddff95e4e9be6dab3c21b9a334
parent69c7fda40921c125eeeef6a827f6270ac6aa1baa
Merge tag 'iwlwifi-for-kalle-2016-01-26_2' of https://git./linux/kernel/git/iwlwifi/iwlwifi-fixes

* Fix support for 3168 device
        + NVM version
        + firmware file name
        + device IDs
* Fix a compilation warning in dvm calibration code
* Fix the TPC (reduced Tx Power) code. This fixes performance issues
* Device IDs for 8265