Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / watchdog.h
2006-06-20 Wim Van Sebroeck[WATCHDOG] add WDIOC_GETTIMELEFT ioctl
2006-06-20 Corey Minyard[WATCHDOG] Pre-Timeout flags
2005-07-27 Andrey Panin[PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2