diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 18:49:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 18:49:13 +0100 |
| commit | 7252f1405df1634d798628847d87592de359fe47 (patch) | |
| tree | 23ce3baeee357eee59e0b9f3080b58830cdc1ecf /fs/proc/array.c | |
| parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
| parent | 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad (diff) | |
Merge tag 'timers-v5.6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Some cleanups for the timer-of, use %p0F and the unique device name
(Geert Uytterhoeven)
- Use timer-of for the renesas-ostm and the device name to prevent
name collision in case of multiple timers (Geert Uytterhoeven)
- Check if there is an error after calling of_clk_get in asm9260
(Chuhong Yuan)
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions