summaryrefslogtreecommitdiff
path: root/include/linux/hrtimer.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-02 16:57:47 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-06-02 16:57:47 +0200
commit09cbbf0c169dd81487682622500c81a9012cbeef (patch)
tree0beb190e21c9ba3ad2f2dbc3ee072e1c8623ad27 /include/linux/hrtimer.h
parentbe3ef76e9d9b97962c70bd6351787d29071ae481 (diff)
parentd4688bdc6335e9faaf3f0173f96932cd520cee1a (diff)
Merge branch 'clockevents/4.2' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents/clocksource changes from Daniel Lezcano: - Removed dead code in the files related to mach-msm for qcom (Stephen Boyd) - Cleaned up code for exynos_mct (Krzysztof Kozlowski) - Added the new timer lpc3220 (Joachim Eastwood) - Added the new timer STM32 and ARM system timer (Maxime Coquelin)
Diffstat (limited to 'include/linux/hrtimer.h')
0 files changed, 0 insertions, 0 deletions