Merge "board: 8930: turn off haptics clock in suspend" into msm-3.0