diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 20:21:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 20:21:32 -0800 |
| commit | ebcffcda311c357c18985c9a13ae2a32f9a0f655 (patch) | |
| tree | 8ec17b41ab6a7c8c5d7e3e175fe6b1e40a9b12ab /drivers/platform | |
| parent | 0ec28c37c21a2b4393692e832e11a7573ac545e2 (diff) | |
| parent | ba90f261cdcbf5535bb46381b1849815268daa3f (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.
Diffstat (limited to 'drivers/platform')
0 files changed, 0 insertions, 0 deletions