Merge "msm: krait-regulator: fix up CPU_UP_CANCELED handling"