projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ff50e8
1b57b62
)
Merge tag 'mac80211-for-davem-2017-05-23' of git://git.kernel.org/pub/scm/linux/kerne...
author
David S. Miller
<davem@davemloft.net>
Wed, 24 May 2017 19:31:39 +0000
(15:31 -0400)
committer
David 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