diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:33:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:33:03 -0700 |
| commit | a9deecba19b8f384d97f82c75379da48bccb2588 (patch) | |
| tree | ed909c58167b93304e74e67d1e8fcbcc37f4de92 /Documentation | |
| parent | d9de2622bd4fd29cab4ef7db66a9f916cb38e032 (diff) | |
| parent | 04bf3b4f5fc033adf921f2e57d034ddbebef5fe7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] MTX-1 Watchdog driver
[WATCHDOG] s3c2410_wdt - initialize watchdog irq resource
[WATCHDOG] Kconfig menuconfig patch
[WATCHDOG] pcwd.c: Port to the new device driver model
[WATCHDOG] use mutex instead of semaphore in Berkshire USB-PC Watchdog driver
[WATCHDOG] the scheduled removal of the i8xx_tco watchdog driver
[WATCHDOG] Semi-typical watchdog bug re early misc_register()
[WATCHDOG] add support for the w83627thf chipset.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 676b7981adb7..c6322c760348 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -278,14 +278,6 @@ Who: Richard Purdie <rpurdie@rpsys.net> --------------------------- -What: i8xx_tco watchdog driver -When: in 2.6.22 -Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt - watchdog driver. -Who: Wim Van Sebroeck <wim@iguana.be> - ---------------------------- - What: Multipath cached routing support in ipv4 When: in 2.6.23 Why: Code was merged, then submitter immediately disappeared leaving |