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

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2008-05-25 14:59:59 -07:00

parent 32522bfdae a49056da03

commit c8ff99a7c2

8 changed files with 485 additions and 116 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/watchdog/Kconfig

View file

1

drivers/watchdog/Makefile

View file

111

drivers/watchdog/bfin_wdt.c

View file

88

drivers/watchdog/booke_wdt.c

View file

309

drivers/watchdog/geodewdt.c

View file

27

drivers/watchdog/hpwdt.c

View file

14

drivers/watchdog/iTCO_wdt.c

View file

38

drivers/watchdog/w83697hf_wdt.c

View file