| commit | ccce27c0fe9dd61bc35ba2f52a2de485008c53ed | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:51:19 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:51:19 2012 -0700 |
| tree | 8efd5f7d4a1a0ed005467b19a41c187362bf0de6 | |
| parent | 221d3ebf3ad2c69704e21495e9a936c78d797732 [diff] | |
| parent | 8b9468d496abd357cc797b27a79d4402f5e0e94d [diff] |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This fixes:
- the WDIOC_GETSTATUS return value
- the unregister of all NMI events on exit
- the loading of the iTCO_wdt driver after the conversion to the
lpc_ich mfd model."
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: core: fix WDIOC_GETSTATUS return value
watchdog: hpwdt: Unregister NMI events on exit.
watchdog: iTCO_wdt: add platform driver module alias