Merge remote-tracking branch 'mac80211/master' into mac80211-next
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Signed-off-by: 
Johannes Berg <johannes.berg@intel.com>
No related branches found
No related tags found
Showing
- drivers/bcma/driver_mips.c 3 additions, 3 deletionsdrivers/bcma/driver_mips.c
- drivers/bcma/scan.c 10 additions, 5 deletionsdrivers/bcma/scan.c
- drivers/net/wireless/mac80211_hwsim.c 0 additions, 5 deletionsdrivers/net/wireless/mac80211_hwsim.c
- include/net/cfg80211.h 2 additions, 0 deletionsinclude/net/cfg80211.h
- net/mac80211/cfg.c 4 additions, 5 deletionsnet/mac80211/cfg.c
- net/mac80211/mesh.c 3 additions, 0 deletionsnet/mac80211/mesh.c
- net/mac80211/mlme.c 6 additions, 0 deletionsnet/mac80211/mlme.c
- net/mac80211/scan.c 1 addition, 2 deletionsnet/mac80211/scan.c
- net/mac80211/tx.c 16 additions, 22 deletionsnet/mac80211/tx.c
- net/wireless/nl80211.c 3 additions, 1 deletionnet/wireless/nl80211.c
- net/wireless/reg.c 18 additions, 1 deletionnet/wireless/reg.c
Loading
Please register or sign in to comment