Merge tag 'iwlwifi-for-kalle-2015-12-16' into next

author Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)

committer Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
author Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
committer Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
diff --cc drivers/net/wireless/intel/iwlwifi/iwl-7000.c
Simple merge
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c
Simple merge
author	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
committer	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Sun, 20 Dec 2015 12:48:08 +0000 (14:48 +0200)
		1	2
drivers/net/wireless/intel/iwlwifi/iwl-7000.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c	patch \|	diff1 \|	diff2 \|	blob \| history