tree 92c785d5ab40f9b8c3d4dc899e88673502c993cf
parent 32522bfdaed094e447f71cce68c349847ae9c7d5
parent a49056da0325742d3b4f5d1ef7bf8ab0690c3888
author Linus Torvalds <torvalds@linux-foundation.org> 1211752799 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211752799 -0700

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