From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 May 2018 19:53:00 +0000 (-0400)
Subject: Merge tag 'mac80211-next-for-davem-2018-05-23' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ee6ad201e6cba94e199da78a7fdece8881352b4;p=linux.git

Merge tag 'mac80211-next-for-davem-2018-05-23' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

For this round, we have various things all over the place, notably
 * a fix for a race in aggregation, which I want to let
   bake for a bit longer before sending to stable
 * some new statistics (ACK RSSI, TXQ)
 * TXQ configuration
 * preparations for HE, particularly radiotap
 * replace confusing "country IE" by "country element" since it's
   not referring to Ireland

Note that I merged net-next to get a fix from mac80211 that got
there via net, to apply one patch that would otherwise conflict.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

5ee6ad201e6cba94e199da78a7fdece8881352b4