From: David S. Miller <davem@davemloft.net>
Date: Wed, 5 Oct 2016 00:14:07 +0000 (-0400)
Subject: Merge tag 'mac80211-next-for-davem-2016-10-04' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.9-rc1~127^2~1
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=1ebf8b42b1f6da380f70990234c119f4d63905c9;hp=1e1430d5282bc3a572465ef3261eea793d98a653;p=cascardo%2Flinux.git

Merge tag 'mac80211-next-for-davem-2016-10-04' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
This time around, we have
 * Neighbor Awareness Networking (NAN) APIs
 * a fix for a previous patch that caused memory corruption
   in wireless extensions key settings
 * beacon rate configuration for AP and mesh
 * memory limits for mac80211's internal TXQs
 * a (fairly involved) fix for the TXQ vs. crypto problems
 * direct cfg80211 driver API for WEP keys

This also pulls in net-next to fix the merge conflicts, see
the merge commit for more details.
====================

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