]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2012 18:51:19 +0000 (11:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2012 18:51:19 +0000 (11:51 -0700)
commitf21035311ac697b31e9831dd4401fa58a34f0fb1
tree8efd5f7d4a1a0ed005467b19a41c187362bf0de6
parent826275fc2ba6ef51f1e3a06b5443609c42a34c2c
parentd7634384c59147e37e68633a790b54b12a329e62
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