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)
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>
1  2 
include/net/cfg80211.h
net/mac80211/mesh_plink.c
net/mac80211/tdls.c
net/mac80211/tx.c
net/wireless/reg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge