Merge commit '1dbcb97c65' into omap-for-v4.20/soc

This commit is contained in:
Tony Lindgren 2018-09-07 10:49:43 -07:00
commit 359c533f07