Merge commit '7d56bedb2730dc2ea8abf0fd7240ee99ecfee3c9' into omap-for-v5.1/fixes
authorTony Lindgren <tony@atomide.com>
Mon, 1 Apr 2019 16:36:25 +0000 (09:36 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Apr 2019 16:36:25 +0000 (09:36 -0700)

Trivial merge