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 /Documentation/devicetree/bindings/input/cap11xx.txt | |
| parent | Merge tag 'media/v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| parent | watchdog: imx2_wdt: Fix the argument of watchdog_active() (diff) | |
| download | linux-dev-ebcffcda311c357c18985c9a13ae2a32f9a0f655.tar.xz linux-dev-ebcffcda311c357c18985c9a13ae2a32f9a0f655.zip | |
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 'Documentation/devicetree/bindings/input/cap11xx.txt')
0 files changed, 0 insertions, 0 deletions