diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-11-02 21:58:39 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-11-02 21:58:39 +0100 |
commit | bff9a1076adfb787036ced707fc28cfa578aee99 (patch) | |
tree | fd9acd5eda2ab28189536a43266e763d2c05f50e /drivers/scsi/sd.c | |
parent | Merge tag 'for-linus-20180929' of git://git.kernel.dk/linux-block (diff) | |
parent | dt-bindings: timer: gx6605s SOC timer (diff) | |
download | linux-dev-bff9a1076adfb787036ced707fc28cfa578aee99.tar.xz linux-dev-bff9a1076adfb787036ced707fc28cfa578aee99.zip |
Merge branch 'clockevents/4.20-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevent update from Daniel Lezcano:
- Add the per cpu timer for the c-sky architecture (Guo Ren)
- Add the global timer for the c-sky architecture (Guo Ren)
Diffstat (limited to 'drivers/scsi/sd.c')
0 files changed, 0 insertions, 0 deletions