diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-11 21:26:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-11 21:26:07 +0200 |
| commit | a2b7ab45b8905b9c1813b0212e82a39d5c081c8a (patch) | |
| tree | baa08d60c773c39ff12062df6a6bd887c5398649 /arch/arm/mach-omap2/serial.h | |
| parent | Revert "iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,fr... (diff) | |
| parent | watchdog: da9063: remove duplicated timeout_to_sel calls (diff) | |
| download | linux-a2b7ab45b8905b9c1813b0212e82a39d5c081c8a.tar.xz linux-a2b7ab45b8905b9c1813b0212e82a39d5c081c8a.zip | |
Merge tag 'linux-watchdog-4.18-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
"Core:
- simplify getting .drvdata
renesas_wdt:
- add support for the R8A77965 WDT and R-Car Gen2
- remove R-Car M2-W ES2.x from blacklist
sp805:
- add restart handler
hpwdt:
- claim NMIs generated by iLO5
mena21_wdt:
- drop unnecessary mutex lock
da9062 & da9063:
- fixes and general cleanups"
* tag 'linux-watchdog-4.18-rc1' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: da9063: remove duplicated timeout_to_sel calls
watchdog: da9063: rename helper function to avoid misunderstandings
watchdog: da9062: remove unused code
watchdog: da9063: Fix timeout handling during probe
watchdog: da9063: Fix updating timeout value
watchdog: da9063: Fix setting/changing timeout
dt-bindings: watchdog: renesas-wdt: Add R-Car Gen2 support
watchdog: mena21_wdt: Drop unnecessary mutex lock
watchdog: renesas-wdt: Add support for the R8A77965 WDT
watchdog: hpwdt: Claim NMIs generated by iLO5
watchdog: sp805: add restart handler
watchdog: renesas-wdt: Remove R-Car M2-W ES2.x from blacklist
watchdog: simplify getting .drvdata
Diffstat (limited to 'arch/arm/mach-omap2/serial.h')
0 files changed, 0 insertions, 0 deletions