Merge branch 'v4.5-clk/clkids' into v4.5-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Mon, 23 Nov 2015 20:23:30 +0000 (21:23 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 23 Nov 2015 20:23:30 +0000 (21:23 +0100)

Trivial merge