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] HP ProLiant WatchDog driver
  [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata
  [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API
  [WATCHDOG] Add support for SB1 hardware watchdog

...

This commit is contained in:

Linus Torvalds 2008-02-19 08:02:04 -08:00

parent cf91b824bb 7f4da4745c

commit 9ef38eaf42

6 changed files with 1340 additions and 8 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

25

drivers/watchdog/Kconfig

View file

2

drivers/watchdog/Makefile

View file

7

drivers/watchdog/bfin_wdt.c

View file

926

drivers/watchdog/hpwdt.c

View file

35

drivers/watchdog/mtx-1_wdt.c

View file

353

drivers/watchdog/sb_wdog.c

View file