Merge tag 'mac80211-next-for-davem-2017-10-11' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Oct 2017 17:15:01 +0000 (10:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Oct 2017 17:15:01 +0000 (10:15 -0700)
commitdf2fd38a08272fcc2c658f2c4d7d6318e8da593e
tree0573548f36917a3af84d571cac557da6f5eab032
parentb8226962b1c49c784aeddb9d2fafbf53dfdc2190
parent90a53e4432b12288316efaa5f308adafb8d304b0
Merge tag 'mac80211-next-for-davem-2017-10-11' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Work continues in various areas:
 * port authorized event for 4-way-HS offload (Avi)
 * enable MFP optional for such devices (Emmanuel)
 * Kees's timer setup patch for mac80211 mesh
   (the part that isn't trivially scripted)
 * improve VLAN vs. TXQ handling (myself)
 * load regulatory database as firmware file (myself)
 * with various other small improvements and cleanups

I merged net-next once in the meantime to allow Kees's
timer setup patch to go in.
====================

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