]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit462e4ed2f9d53abf1acc0fcd9eb65f3014048e60
tree75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9
parent004ad927dee3a6109fedbafd93a0865725522e7b
parent15645f877ac9edb04e6f392faada9020f225b968
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