From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jun 2012 18:51:19 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.5-rc5~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ccce27c0fe9dd61bc35ba2f52a2de485008c53ed;p=~emulex%2Finfiniband.git

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
---

ccce27c0fe9dd61bc35ba2f52a2de485008c53ed