Merge commit 'fe7020e64f04' into omap-for-v4.16/dt-clk
authorTony Lindgren <tony@atomide.com>
Mon, 11 Dec 2017 16:26:36 +0000 (08:26 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Dec 2017 16:26:36 +0000 (08:26 -0800)

Trivial merge