Merge remote-tracking branch 'mac80211/master' into HEAD
There are a few things that would otherwise conflict.
Signed-off-by: 
Johannes Berg <johannes.berg@intel.com>
Showing
- net/mac80211/cfg.c 11 additions, 0 deletionsnet/mac80211/cfg.c
- net/mac80211/iface.c 7 additions, 1 deletionnet/mac80211/iface.c
- net/mac80211/mlme.c 23 additions, 5 deletionsnet/mac80211/mlme.c
- net/mac80211/tx.c 51 additions, 29 deletionsnet/mac80211/tx.c
- net/wireless/core.c 1 addition, 2 deletionsnet/wireless/core.c
- net/wireless/nl80211.c 27 additions, 83 deletionsnet/wireless/nl80211.c
Loading
Please register or sign in to comment