Merge branch 'v4.7-shared/clkids' into v4.7-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Mon, 25 Apr 2016 20:48:19 +0000 (22:48 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 25 Apr 2016 20:48:19 +0000 (22:48 +0200)

Trivial merge