Merge "msm: timer: read timer twice on 8960" into msm-3.0