Merge branch 'omap-for-v5.5/omap1' into omap-for-v5.5/soc
authorTony Lindgren <tony@atomide.com>
Mon, 11 Nov 2019 20:48:55 +0000 (12:48 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Nov 2019 20:48:55 +0000 (12:48 -0800)

Trivial merge