Merge branch 'v4.11-shared/clkids' into v4.11-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Thu, 5 Jan 2017 12:06:50 +0000 (13:06 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Thu, 5 Jan 2017 12:06:50 +0000 (13:06 +0100)

Trivial merge