Merge tag 'mac80211-next-for-net-next-2019-10-11' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Sun, 13 Oct 2019 18:29:07 +0000 (11:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 13 Oct 2019 18:29:07 +0000 (11:29 -0700)
commit7e0d15ee0d8ba28a41ed02c8d2c1c17124b13234
tree05dd5ee69af1a16110e999be6e6b0482bbe68124
parentcb0ce18aaf4c08f1c5c60d8a09fcba34f63f6f51
parent7dfd8ac327301f302b03072066c66eb32578e940
Merge tag 'mac80211-next-for-net-next-2019-10-11' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
A few more small things, nothing really stands out:
 * minstrel improvements from Felix
 * a TX aggregation simplification
 * some additional capabilities for hwsim
 * minor cleanups & docs updates
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/mac80211_hwsim.c
net/wireless/nl80211.c