Merge branch 'v4.11-shared/clkids' into v4.11-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Fri, 13 Jan 2017 16:13:33 +0000 (17:13 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 13 Jan 2017 16:13:33 +0000 (17:13 +0100)

Trivial merge