summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 14:33:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 14:33:03 -0700
commita9deecba19b8f384d97f82c75379da48bccb2588 (patch)
treeed909c58167b93304e74e67d1e8fcbcc37f4de92 /MAINTAINERS
parentd9de2622bd4fd29cab4ef7db66a9f916cb38e032 (diff)
parent04bf3b4f5fc033adf921f2e57d034ddbebef5fe7 (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 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cfd26ddccd7..bd558ac5bb7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1718,12 +1718,6 @@ P: H. Peter Anvin
M: hpa@zytor.com
S: Maintained
-i810 TCO TIMER WATCHDOG
-P: Nils Faerber
-M: nils@kernelconcepts.de
-W: http://www.kernelconcepts.de/
-S: Maintained
-
IA64 (Itanium) PLATFORM
P: Tony Luck
M: tony.luck@intel.com