projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 322cd40 923b352)
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)
commit72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d
tree8f014bc8663c3e0eec3250ceb46ca18674e8932atree | snapshot
parent322cd406da0b102dda9c0eec46181458a3667dbbcommit | diff
parent923b352f19d9ea971ae2536eab55f5fc9e95fedfcommit | 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
Domain: System / Kernel;