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)
* 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


Trivial merge