diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 10:35:18 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 10:35:18 -0400 |
commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /MAINTAINERS | |
parent | d96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff) | |
parent | c19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff) |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
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 | |||
3058 | L: lm-sensors@lm-sensors.org | 3058 | L: lm-sensors@lm-sensors.org |
3059 | S: Odd Fixes | 3059 | S: Odd Fixes |
3060 | 3060 | ||
3061 | WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC) | ||
3062 | P: Nenad Corbic | ||
3063 | M: ncorbic@sangoma.com | ||
3064 | M: dm@sangoma.com | ||
3065 | W: http://www.sangoma.com | ||
3066 | S: Supported | ||
3067 | |||
3068 | WATCHDOG DEVICE DRIVERS | 3061 | WATCHDOG DEVICE DRIVERS |
3069 | P: Wim Van Sebroeck | 3062 | P: Wim Van Sebroeck |
3070 | M: wim@iguana.be | 3063 | M: wim@iguana.be |