]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adba52f e16d6a7)
Merge tag 'mac80211-for-davem-2017-05-23' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 May 2017 19:31:39 +0000 (15:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 May 2017 19:31:39 +0000 (15:31 -0400)
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>

Trivial merge
Linux Kernel Source Tree.