From: Linus Torvalds Date: Mon, 9 Jan 2012 22:40:48 +0000 (-0800) Subject: Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8cbce976050a9f874a8b07012ddeb9b9eb59603;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge tag 'timer' of git://git./linux/kernel/git/arm/arm-soc timer changes for msm A very simple series. We used to have more churn in the timer area, so this is kept separate. Will probably put this into the drivers series next time. * tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: msm: timer: Use clockevents_config_and_register() msm: timer: Setup interrupt after registering clockevent msm: timer: Remove SoC specific #ifdefs msm: timer: Remove msm_clocks[] and simplify code msm: timer: Fix ONESHOT mode interrupts msm: timer: Use GPT for clockevents and DGT for clocksource msm: timer: Cleanup #includes and #defines msm: timer: Tighten #ifdef for local timer support --- e8cbce976050a9f874a8b07012ddeb9b9eb59603