1
linux/drivers/char/watchdog
Linus Torvalds 67d2c36e90 Merge watchdog driver updates
Automated merge from

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

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
2005-09-05 06:00:45 -07:00
..
acquirewdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
advantechwdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
alim1535_wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
alim7101_wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
booke_wdt.c [PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables 2005-09-05 00:05:57 -07:00
cpu5wdt.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
eurotechwdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
i8xx_tco.c [PATCH] i8xx_tco.c: arm watchdog only when started 2005-08-09 12:08:21 -07:00
i8xx_tco.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ib700wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
indydog.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
ixp4xx_wdt.c [WATCHDOG] correct sysfs name for watchdog devices 2005-09-03 13:51:18 +02:00
ixp2000_wdt.c [WATCHDOG] correct sysfs name for watchdog devices 2005-09-03 13:51:18 +02:00
Kconfig [PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables 2005-09-05 00:05:57 -07:00
machzwd.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
Makefile Merge watchdog driver updates 2005-09-05 06:00:45 -07:00
mixcomwd.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
mpc8xx_wdt.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pcwd_pci.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
pcwd_usb.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
pcwd.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
s3c2410_wdt.c [WATCHDOG] s3c2410 watchdog - replace reboot notifier 2005-09-03 13:56:06 +02:00
sa1100_wdt.c [PATCH] ARM: 2833/2: Remove support for WDIOF_MAGICCLOSE from sa1100-wdt 2005-08-03 20:34:52 +01:00
sbc60xxwdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
sc520_wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
sc1200wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
scx200_wdt.c [WATCHDOG] correct sysfs name for watchdog devices 2005-09-03 13:51:18 +02:00
shwdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
softdog.c [WATCHDOG] softdog-timer-running-oops.patch 2005-09-03 13:59:46 +02:00
w83627hf_wdt.c [WATCHDOG] w83627hf_wdt.c-initialized_bios_bug 2005-09-03 13:58:03 +02:00
w83877f_wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
wafer5823wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
wd501p.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
wdrtas.c [PATCH] ppc64: add a watchdog driver for rtas 2005-06-23 09:43:34 +10:00
wdt285.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
wdt977.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
wdt_pci.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00
wdt.c [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling 2005-07-27 16:25:54 -07:00