Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

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

Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)

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

Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
author Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
committer Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
diff --cc drivers/net/wireless/iwlwifi/mvm/fw.c
Simple merge
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/ops.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
author	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
committer	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
		1	2
drivers/net/wireless/iwlwifi/mvm/fw.c	patch \|	diff1 \|	diff2 \|	blob \| history
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/ops.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	patch \|	diff1 \|	diff2 \|	blob \| history