From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jun 2009 20:14:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.31-rc1~141
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=9e3e4b1d2d13bead8d52703c82a02b55f108b491;p=safe%2Fjmp%2Flinux-2.6

Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] hpwdt: Add NMI sourcing
  [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue.
  [WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware
  [WATCHDOG] Correct WDIOF_MAGICCLOSE flag
  [WATCHDOG] move platform probe and remove function to devinit and devexit
  [WATCHDOG] Some more general cleanup
  [WATCHDOG] iTCO_wdt: Cleanup code
---

9e3e4b1d2d13bead8d52703c82a02b55f108b491