diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 16:03:47 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 16:03:47 +0200 |
commit | bc30658eff39c5bb562174fcf93618ab6a7afe88 (patch) | |
tree | aad37b7210699c861ea71ae9674000aae988d01b /kernel/time | |
parent | 4e2a809703e2b2300438a425b0a3f2013b55fcc6 (diff) | |
parent | 469869d18a886e046161ca65516bd3ffcd2f804b (diff) | |
download | blackbird-obmc-linux-bc30658eff39c5bb562174fcf93618ab6a7afe88.tar.gz blackbird-obmc-linux-bc30658eff39c5bb562174fcf93618ab6a7afe88.zip |
Merge branch 'clockevents/4.14' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Add the new imx-tpm driver (Dong Aisheng)
- Remove DT deprecated binding for Renesas (Magnus Damm)
- Remove error message on memory allocation (Markus Elfring)
- Convert clocksource drivers to use %pOF
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions