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 Nano 7240 driver
  [WATCHDOG] ipmi: add the standard watchdog timeout ioctls
  [WATCHDOG] IT8212F watchdog driver
  [WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED
  [WATCHDOG] bfin_wdt, remove SPIN_LOCK_UNLOCKED
  [WATCHDOG] Stop looking for device as soon as one is found
  [WATCHDOG] at32ap700x_wdt: add support for boot status and add fix for silicon errata

...

This commit is contained in:

Linus Torvalds 2007-12-17 09:53:51 -08:00

parent 5cdddecc8b c4c283357d

commit 980110c5da

9 changed files with 821 additions and 7 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

2

drivers/char/ipmi/ipmi_watchdog.c

View file

2

drivers/sbus/char/cpwatchdog.c

View file

23

drivers/watchdog/Kconfig

View file

2

drivers/watchdog/Makefile

View file

69

drivers/watchdog/at32ap700x_wdt.c

View file

2

drivers/watchdog/bfin_wdt.c

View file

400

drivers/watchdog/it8712f_wdt.c

View file

324

drivers/watchdog/sbc7240_wdt.c

View file

4

drivers/watchdog/w83697hf_wdt.c

View file