From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Oct 2015 14:28:41 +0000 (-0700)
Subject: Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~9125^2~85
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9829b9745b6e1683fd2a90842da498a2197299e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Here's another set of patches for the current cycle:
 * I merged net-next back to avoid a conflict with the
 * cfg80211 scheduled scan API extensions
 * preparations for better scan result timestamping
 * regulatory cleanups
 * mac80211 statistics cleanups
 * a few other small cleanups and fixes
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e9829b9745b6e1683fd2a90842da498a2197299e