Merge "msm: clock-generic: Add a combined mux_div clock"