From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Feb 2016 19:20:15 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v4.5-rc3~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed1741b77c162ad7087949fda39af4ec8c33e663;p=users%2Fhch%2Fdma-mapping.git

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes several Kconfig dependencies, a compilation warning in
  pcwd_usb, a failure to abort the sp805 wdt after a ping and the
  max63xx wdt's MODULE_LICENSE"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Fix dependencies for !HAS_IOMEM archs
  watchdog: imgdpc: select WATCHDOG_CORE
  watchdog: tango: rename ARCH_TANGOX to ARCH_TANGO
  watchdog: pcwd_usb: fix compilation warning
  watchdog: sp805: ping fails to abort wdt reset
  watchdog: max63xx: make module's license marker match the header
---

ed1741b77c162ad7087949fda39af4ec8c33e663