]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1d9956 5ccb17a)
Merge branch 'mac80211' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 17 Jul 2015 13:39:38 +0000 (15:39 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 17 Jul 2015 13:39:41 +0000 (15:39 +0200)
commit4538cdbe84a00593a33e5eb1cef7c3ee6012f42a
tree8f014bc8663c3e0eec3250ceb46ca18674e8932atree | snapshot
parente1d9956c67933d4271e3619a6984440211926ecfcommit | diff
parent5ccb17ac42ac468c469140c9ad237136ba196c1ecommit | diff
Merge branch 'mac80211' into mac80211-next

This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/cfg80211.h diff1 | diff2 | blob | history
net/mac80211/mesh_plink.c diff1 | diff2 | blob | history
net/mac80211/tdls.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.