Merge "video: msm: Do not use disable_irq in the spin_lock_irqsave context"