Merge branch 'fixes-dra7' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 20 May 2019 15:32:11 +0000 (08:32 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 May 2019 15:32:11 +0000 (08:32 -0700)

Trivial merge