Merge commit '1dbcb97c656eed1a244c960b8b3a469c3d20ce7b' into omap-for-v4.20/soc
authorTony Lindgren <tony@atomide.com>
Fri, 7 Sep 2018 17:49:43 +0000 (10:49 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 7 Sep 2018 17:49:43 +0000 (10:49 -0700)

Trivial merge