From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 13 Dec 2015 07:41:59 +0000 (+0200)
Subject: Merge tag 'mac80211-next-for-davem-2015-12-07' into next
X-Git-Tag: v4.5-rc1~128^2~63^2~33^2~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b18d42dda985c99db4adde45bbdf7cd79a7525c;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'mac80211-next-for-davem-2015-12-07' into next

This pull request got a bit bigger than I wanted, due to
needing to reshuffle and fix some bugs. I merged mac80211
to get the right base for some of these changes.

 * new mac80211 API for upcoming driver changes: EOSP handling,
   key iteration
 * scan abort changes allowing to cancel an ongoing scan
 * VHT IBSS 80+80 MHz support
 * re-enable full AP client state tracking after fixes
 * various small fixes (that weren't relevant for mac80211)
 * various cleanups
---

9b18d42dda985c99db4adde45bbdf7cd79a7525c