Merge remote-tracking branch 'wireless-next/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 29 Jan 2013 11:16:22 +0000 (12:16 +0100)
commit448cd55c37dc3ea30705c4826ac3e7dbbcb74aa2
treeac1b09f416944e50119b31165d6c8bca47e6ca77
parent3b4797bce0050570e84bedd10e1b14e9320a3551
parent9ebea3829fac7505e0cd2642fbd13cfa9c038831
Merge remote-tracking branch 'wireless-next/master' into HEAD
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
net/mac80211/ieee80211_i.h
net/mac80211/tx.c