git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ec28c3 ba90f26)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 04:21:32 +0000 (20:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 04:21:32 +0000 (20:21 -0800)
commitebcffcda311c357c18985c9a13ae2a32f9a0f655
tree8ec17b41ab6a7c8c5d7e3e175fe6b1e40a9b12abtree | snapshot
parent0ec28c37c21a2b4393692e832e11a7573ac545e2commit | diff
parentba90f261cdcbf5535bb46381b1849815268daa3fcommit | diff
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.
Pandora Kernel Repository