aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-17 10:35:18 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-17 10:35:18 -0400
commit94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch)
tree2318d487807e9f7393fcd46ef0090a27b4ad7981 /MAINTAINERS
parentd96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff)
parentc19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff)
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 72b6782f6f5c..20f3aea687d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3058,13 +3058,6 @@ M: khali@linux-fr.org
3058L: lm-sensors@lm-sensors.org 3058L: lm-sensors@lm-sensors.org
3059S: Odd Fixes 3059S: Odd Fixes
3060 3060
3061WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
3062P: Nenad Corbic
3063M: ncorbic@sangoma.com
3064M: dm@sangoma.com
3065W: http://www.sangoma.com
3066S: Supported
3067
3068WATCHDOG DEVICE DRIVERS 3061WATCHDOG DEVICE DRIVERS
3069P: Wim Van Sebroeck 3062P: Wim Van Sebroeck
3070M: wim@iguana.be 3063M: wim@iguana.be