]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 537e4bd fae5396)
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)
commit956b610e428ca89d39287c0337101f82b7a167f9
tree8ec17b41ab6a7c8c5d7e3e175fe6b1e40a9b12abtree | snapshot
parent537e4bd661388abf0399287f1b9632ab2f4c92e8commit | diff
parentfae53960d67abece740ae01f3e8e7abbc1920410commit | 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.
Linux Kernel Source Tree.