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

author Kalle Valo <kvalo@codeaurora.org>

Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)

committer Kalle Valo <kvalo@codeaurora.org>

Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)
author Kalle Valo <kvalo@codeaurora.org>
Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)
committer Kalle Valo <kvalo@codeaurora.org>
Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)
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
author	Kalle Valo <kvalo@codeaurora.org>
	Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)
committer	Kalle Valo <kvalo@codeaurora.org>
	Tue, 5 Jul 2016 12:59:54 +0000 (15:59 +0300)
		1	2
drivers/net/wireless/intel/iwlwifi/iwl-drv.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h	patch \|	diff1 \|	diff2 \|	blob \| history