diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-20 11:46:46 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-20 11:46:46 +0200 |
commit | 4e2a809703e2b2300438a425b0a3f2013b55fcc6 (patch) | |
tree | b3233970c706fdd93f9d381c1f48186fe0f8a252 /drivers/clocksource/timer-imx-tpm.c | |
parent | 3cf294962df8fcde710eb5e762e0929e2ba49947 (diff) | |
parent | 47b4a457e4cc816b3fdd2ee55c65fda8ea6de051 (diff) | |
download | linux-4e2a809703e2b2300438a425b0a3f2013b55fcc6.tar.gz linux-4e2a809703e2b2300438a425b0a3f2013b55fcc6.tar.xz |
Merge branch 'fortglx/4.14/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeepig updates from John Stultz
- kselftest improvements
- Use the proper timekeeper in the debug code
- Prevent accessing an unavailable wakeup source in the alarmtimer sysfs
interface.
Diffstat (limited to 'drivers/clocksource/timer-imx-tpm.c')
0 files changed, 0 insertions, 0 deletions