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/unix/af_unix.c | |
| parent | ip6_gre: Reduce log level in ip6gre_err() to debug (diff) | |
| parent | mac80211: reset CQM history upon reconfiguration (diff) | |
| download | linux-deccbe80be947fa89bca18510699893c38856f38.tar.gz 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/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions