]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96a9c0a 0deaa3f)
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)
commit2216a53c6ed6b2f3f3633b4ac78ed21f22ea57e2
tree8ec17b41ab6a7c8c5d7e3e175fe6b1e40a9b12abtree | snapshot
parent96a9c0a58101e7528302b8190949c9137a369bbbcommit | diff
parent0deaa3fc3483b8016b5cdcd421c6c58ac8756ec4commit | 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.