Merge branch 'khadas-vims-4.9.y' of github.com:khadas/linux into khadas-vims-4.9.y
authorNick Xie <nick@khadas.com>
Thu, 20 Aug 2020 02:47:37 +0000 (10:47 +0800)
committerNick Xie <nick@khadas.com>
Thu, 20 Aug 2020 02:47:37 +0000 (10:47 +0800)

Trivial merge