diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-04-04 12:25:19 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-04-04 12:25:19 +0200 |
| commit | 90c7c0c24e2232bbc74c6752c67bf1dfc6b4ced1 (patch) | |
| tree | 6ebe96d799a7077e52d060f7aa96741f9df5882b /drivers/fpga/xilinx-spi.c | |
| parent | bd03143007eb9b03a7f2316c677780561b68ba2a (diff) | |
| parent | 0136c741ff40e03323419feec05fcd594f36a463 (diff) | |
Merge branch 'clockevents/4.17' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Fix timer name and register flow for imx's timer tmp and handle
different counter width (Anson Huang)
- Add the NPCM7xx timer support (Tomer Maimon)
Diffstat (limited to 'drivers/fpga/xilinx-spi.c')
0 files changed, 0 insertions, 0 deletions