| commit | 85d45adef06caa988506686527a5fedf856dc550 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 20:11:34 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 20:11:34 2011 -0700 |
| tree | 8f7bdc8337639b7317a11edddb3dd291e60748d3 | |
| parent | eda0841094a3a232357ca10a24b40da461db3fcf [diff] | |
| parent | fdb9c3cd5124c9a6e4c824ed2bca5b4602e84a1a [diff] |
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