Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:11:34 +0000 (20:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:11:34 +0000 (20:11 -0700)
* '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


Trivial merge