From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 May 2008 21:59:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: Ubuntu-5.0.0-8.9~33434
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c8ff99a7c2fb23a0f1165f3821fd66fd65f30264;p=mirror_ubuntu-disco-kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
  [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
  [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
  [WATCHDOG] hpwdt: Fix NMI handling.
  [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
  [WATCHDOG] Add w83697h_wdt early_disable option
  [WATCHDOG] Make w83697h_wdt timeout option string similar to others
  [WATCHDOG] Make w83697h_wdt void-like functions void
---

c8ff99a7c2fb23a0f1165f3821fd66fd65f30264