]> 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)
commit3fb019e115d4b6e102e6dcb398cb51cd00d3f645
tree75adfb9f5e06ebb7c7d5d5e5a5408fa0d6d504b9
parent8c04ac250882077550e8c24a405fdff4ed98ef12
parent7355a68d375d9d65aa68dc1235d69a4affa813ce
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