Merge branch 'khadas-vims-4.9.y' of https://github.com/yan-wyb/linux into khadas...
authoryan <yan-wyb@foxmail.com>
Tue, 22 Sep 2020 06:04:41 +0000 (14:04 +0800)
committeryan <yan-wyb@foxmail.com>
Tue, 22 Sep 2020 06:04:41 +0000 (14:04 +0800)

Trivial merge