From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Dec 2014 04:21:32 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: firefly_0821_release~176^2~2627
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ebcffcda311c357c18985c9a13ae2a32f9a0f655;p=firefly-linux-kernel-4.4.55.git

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

Pull small watchdog update from Wim Van Sebroeck:
 - fix the argument of watchdog_active() in imx2_wdt
 - Add power management support to the imx2_wdt watchdog.

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: imx2_wdt: Fix the argument of watchdog_active()
  watchdog: imx2_wdt: Add power management support.
---

ebcffcda311c357c18985c9a13ae2a32f9a0f655