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)
commit85d45adef06caa988506686527a5fedf856dc550
tree8f7bdc8337639b7317a11edddb3dd291e60748d3
parenteda0841094a3a232357ca10a24b40da461db3fcf
parentfdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a
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