Merge branch 'v4.7-shared/clkids' into v4.7-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Sat, 16 Apr 2016 01:04:15 +0000 (03:04 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Sat, 16 Apr 2016 01:04:15 +0000 (03:04 +0200)

Trivial merge