From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jun 2011 03:11:34 +0000 (-0700)
Subject: Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm
X-Git-Tag: firefly_0821_release~3680^2~5211
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=85d45adef06caa988506686527a5fedf856dc550;p=firefly-linux-kernel-4.4.55.git

Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm

* 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: timer: Fix DGT rate on 8960 and 8660
  msm: timer: compensate for timer shift in msm_read_timer_count
  msm: timer: Fix SMP build error
---

85d45adef06caa988506686527a5fedf856dc550