Merge branch 'mac80211' into mac80211-next
This was needed to avoid conflicts in the minstrel changes.
Signed-off-by: 
Johannes Berg <johannes.berg@intel.com>
No related branches found
No related tags found
Showing
- net/mac80211/cfg.c 1 addition, 1 deletionnet/mac80211/cfg.c
- net/mac80211/rate.c 1 addition, 1 deletionnet/mac80211/rate.c
- net/mac80211/rc80211_minstrel_debugfs.c 7 additions, 5 deletionsnet/mac80211/rc80211_minstrel_debugfs.c
- net/mac80211/rc80211_minstrel_ht_debugfs.c 8 additions, 5 deletionsnet/mac80211/rc80211_minstrel_ht_debugfs.c
- net/mac80211/sta_info.h 1 addition, 0 deletionsnet/mac80211/sta_info.h
- net/rfkill/core.c 2 additions, 2 deletionsnet/rfkill/core.c
- net/wireless/nl80211.c 9 additions, 1 deletionnet/wireless/nl80211.c
Loading
Please register or sign in to comment