Merge branch 'v4.13-shared/clkids' into v4.13-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Fri, 2 Jun 2017 12:48:32 +0000 (14:48 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 2 Jun 2017 12:48:32 +0000 (14:48 +0200)

Trivial merge