diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-04 20:14:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-04 20:14:07 -0400 |
| commit | 1ebf8b42b1f6da380f70990234c119f4d63905c9 (patch) | |
| tree | 81c8883606ed2dd821f4509581888505d48631dd /drivers/scsi | |
| parent | 9a8dd213d2a38349e5ea2ca8888400952112b45c (diff) | |
| parent | 1e1430d5282bc3a572465ef3261eea793d98a653 (diff) | |
Merge tag 'mac80211-next-for-davem-2016-10-04' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions