Merge branch 'khadas-vims-4.9.y' of https://github.com/yan-wyb/linux into khadas...
authoryan <yan-wyb@foxmail.com>
Tue, 21 Jul 2020 07:27:44 +0000 (15:27 +0800)
committeryan <yan-wyb@foxmail.com>
Tue, 21 Jul 2020 07:27:44 +0000 (15:27 +0800)

Trivial merge