Merge "msm: pm-8x60: Switch to using udelay in msm_pm_wait_cpu_shutdown"