Merge branch 'v4.14-shared/clkids' into v4.14-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Mon, 21 Aug 2017 22:39:00 +0000 (00:39 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 21 Aug 2017 22:39:00 +0000 (00:39 +0200)

Trivial merge