Merge branch 'v4.7-shared/clkids' into v4.7-clk/next