Merge branch 'v4.14-shared/clkids' into v4.14-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Tue, 8 Aug 2017 15:21:45 +0000 (17:21 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Tue, 8 Aug 2017 15:21:45 +0000 (17:21 +0200)

Trivial merge