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

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cfd26ddccd7a0997c10ed46e4c15a7dc021c1761..bd558ac5bb73ced7de418089a9ae499732cfe3c9 100644 (file)
--- 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