]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'mac80211-for-davem-2015-09-22' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2015 22:36:20 +0000 (15:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2015 22:36:20 +0000 (15:36 -0700)
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>

Trivial merge