Merge branch 'fixes-v5.7' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 8 Jun 2020 17:14:49 +0000 (10:14 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 8 Jun 2020 17:14:49 +0000 (10:14 -0700)

Trivial merge