]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)
commita227ebc9a419342f87d171acd807f499562c898f
tree5e8f1fcd10a6b264d60bc8a0503656c0611de222
parent71505cd73ef12b3a1ccb1e170c693fe46452f954
parent2e36ef68db0bca6a58bbb8663339001f681d1039
Merge remote-tracking branch 'mac80211/master' into mac80211-next
include/net/mac80211.h
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c
net/wireless/core.c
net/wireless/nl80211.c