Merge tag 'iwlwifi-next-for-kalle-2016-07-06' of git://git.kernel.org/pub/scm/linux...

* work on DQA continued
* SAR BIOS implementation
* some work on debugging capabilities
* added support for GCMP encryption
* data path rework in preparation for new HW
* some cleanup to remove transport dependency on mac80211
* support for MSIx in preparation for new HW
* lots of work in preparation for HW support (9000 and a000 series)
* general cleanups
* general bugfixes

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
Simple merge