]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51fdff7 e556bbc)
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)
commit04439bef8c6866ffa21cd0bf8a2954a9c01409eb
tree8f014bc8663c3e0eec3250ceb46ca18674e8932atree | snapshot
parent51fdff73eab390fb406c69604a45b30c033fa9f6commit | diff
parente556bbc66ccc46ab4873ecaf1dbcdcd73d971738commit | 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.