Merge tag 'iwlwifi-for-kalle-2016-02-15' into HEAD

These are a few fixes for the current cycle.
3 out of the 5 patches fix a bugzilla.

* fix a race that users reported when we try to load the firmware
  and the hardware rfkill interrupt triggers at the same time.
* Luca fixes a very visible bug in scheduled scan: our firmware
  doesn't support scheduled scan with no profile configured and
  the supplicant sometimes requests such scheduled scans.
* build system fix
* firmware name update for 8265
* typo fix in return value

diff --cc drivers/net/wireless/intel/iwlwifi/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/internal.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge