Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

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

Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)

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

Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
author Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
committer Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/utils.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
author	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
committer	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Tue, 13 May 2014 10:51:53 +0000 (13:51 +0300)
		1	2
drivers/net/wireless/iwlwifi/mvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mvm.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	patch \|	diff1 \|	diff2 \|	blob \| history