summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 21:22:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 21:22:55 +0300
commit7dcca3e92a34bf8ffdc4c01a49182ce1cb6ff534 (patch)
tree4886858a740aff0c993a8110add73d749e79b5aa /arch/mips
parentb9bb6fb73b3e112d241a5edd146740be9a0c3cc0 (diff)
parentcf82f52d3619d2e15c83ec9a03c6ce8cdf6c6b58 (diff)
downloadlinux-7dcca3e92a34bf8ffdc4c01a49182ce1cb6ff534.tar.xz
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: "This contains following changes: - Octeon: convert to watchdog-API and apply some fixes - Cadence wdt: remove dependency on ARCH - add DT bindings for qcom + msm - bcm281xx: Remove use of seq_printf return value - stmp3xxx_rtc_wdt + pnx4008_wdt: fix broken email addresses" * git://www.linux-watchdog.org/linux-watchdog: watchdog: stmp3xxx_rtc_wdt: fix broken email address watchdog: pnx4008_wdt: fix broken email address watchdog: octeon: use fixed length string for register names watchdog: octeon: fix some trivial coding style issues watchdog: octeon: convert to WATCHDOG_CORE API watchdog: cadence: Remove Kconfig dependency on ARCH ARM: msm: add watchdog entries to DT timer binding doc ARM: qcom: add description of KPSS WDT for IPQ8064 watchdog: qcom: use timer devicetree binding watchdog: bcm281xx: Remove use of seq_printf return value
Diffstat (limited to 'arch/mips')
0 files changed, 0 insertions, 0 deletions