diff options
author | David S. Miller <davem@davemloft.net> | 2015-09-24 15:36:20 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-24 15:36:20 -0700 |
commit | deccbe80be947fa89bca18510699893c38856f38 (patch) | |
tree | 3b46d855020651982da6857a310d927b63a8bd92 /net/core/net-sysfs.h | |
parent | a46496ce38eeb401344d5623c1960dbf2f1769be (diff) | |
parent | babc305e21ea3811d98b67437299360904ac1b6a (diff) | |
download | blackbird-op-linux-deccbe80be947fa89bca18510699893c38856f38.tar.gz blackbird-op-linux-deccbe80be947fa89bca18510699893c38856f38.zip |
Merge tag 'mac80211-for-davem-2015-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just two small fixes:
* VHT MCS mask array overrun, reported by Dan Carpenter
* reset CQM history to always get a notification, from Sara Sharon
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net-sysfs.h')
0 files changed, 0 insertions, 0 deletions