diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 21:44:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 21:44:03 +0200 |
| commit | d95c8844399885cd511c6f6395621cc1a9fe2e68 (patch) | |
| tree | c6d7f2a075e78b4ef95a128c5cce7c1bd1d6850c /drivers/crypto/atmel-sha-regs.h | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | Merge branch 'clockevents/4.17' of https://git.linaro.org/people/daniel.lezca... (diff) | |
| download | linux-d95c8844399885cd511c6f6395621cc1a9fe2e68.tar.xz linux-d95c8844399885cd511c6f6395621cc1a9fe2e68.zip | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull missed timer updates from Thomas Gleixner:
"This is a branch which got forgotten during the merge window, but it
contains only fixes and hardware enablement. No fundamental changes.
- Various fixes for the imx-tpm clocksource driver
- A new timer driver for the NCPM7xx SoC family"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/imx-tpm: Add different counter width support
clocksource/drivers/imx-tpm: Correct some registers operation flow
clocksource/drivers/imx-tpm: Fix typo of clock name
dt-bindings: timer: tpm: fix typo of clock name
clocksource/drivers/npcm: Add NPCM7xx timer driver
dt-binding: timer: document NPCM7xx timer DT bindings
Diffstat (limited to 'drivers/crypto/atmel-sha-regs.h')
0 files changed, 0 insertions, 0 deletions