From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 May 2017 19:31:39 +0000 (-0400)
Subject: Merge tag 'mac80211-for-davem-2017-05-23' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: MMI-PSA29.97-13-9~5530^2~17
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=029c58178b9aa0a293a86ee0da3355611ac99d07;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'mac80211-for-davem-2017-05-23' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just two fixes this time:
 * fix the scheduled scan "BUG: scheduling while atomic"
 * check mesh address extension flags more strictly
====================

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

029c58178b9aa0a293a86ee0da3355611ac99d07