Folded into this merge commit is a build error fix: s/clk/core in clk_change_rate due to the new struct clk_core
