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

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

Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)

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

Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
author Johannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
committer Johannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/tx.c
Simple merge
author	Johannes Berg <johannes.berg@intel.com>
	Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
committer	Johannes Berg <johannes.berg@intel.com>
	Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
		1	2
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	patch \|	diff1 \|	diff2 \|	blob \| history