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

author Johannes Berg <johannes.berg@intel.com>

Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)

committer Johannes Berg <johannes.berg@intel.com>

Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
author Johannes Berg <johannes.berg@intel.com>
Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
committer Johannes Berg <johannes.berg@intel.com>
Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
Simple merge
author	Johannes Berg <johannes.berg@intel.com>
	Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
committer	Johannes Berg <johannes.berg@intel.com>
	Wed, 20 Mar 2013 13:30:42 +0000 (14:30 +0100)
		1	2
drivers/net/wireless/iwlwifi/mvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/tx.c	patch \|	diff1 \|	diff2 \|	blob \| history