Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 22 Apr 2013 13:31:43 +0000 (15:31 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 22 Apr 2013 13:31:43 +0000 (15:31 +0200)
commita42c74ee608a424342ef7069ccddf196d873040c
tree75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9
parent97990a060e6757f48b931a3946b17c1c4362c3fb
parent9b383672452bb1097124c76fcb4903e0021f6baf
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/rxon.c
net/mac80211/cfg.c
net/mac80211/chan.c
net/mac80211/ieee80211_i.h
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/wireless/nl80211.c