From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Sep 2013 15:45:53 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: firefly_0821_release~176^2~5332
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=24ba40588fe50adce2a99e026fc0026872ebeb85;p=firefly-linux-kernel-4.4.55.git

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

Pull watchdog updates from Wim Van Sebroeck:
 - New watchdog driver for Allwinner A10/A13
 - some devm_ioremap_resource simplifications
 - a s3c2410_wdt change that removes the global variables

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource
  watchdog: simplify platform_get_resource_byname/devm_ioremap_resource
  watchdog: ts72xx_wdt: simplify use of devm_ioremap_resource
  watchdog: nuc900_wdt.c: simplify use of devm_ioremap_resource
  watchdog: sunxi: New watchdog driver for Allwinner A10/A13
  watchdog: s3c2410_wdt: remove the global variables
---

24ba40588fe50adce2a99e026fc0026872ebeb85