diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 11:36:59 -0400 |
| commit | dd504ea16f34a29da4aa933ae7ab917fcfd25fd7 (patch) | |
| tree | 0502645dc159be29c33c992e9e56dc3156074279 /MAINTAINERS | |
| parent | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (diff) | |
| parent | 0479ea0eab197b3e5d4c731f526c02e5e3fbfbd0 (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bbeb5b6b5b05..4c3277cb925e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2689,13 +2689,13 @@ L: i2c@lm-sensors.org | |||
| 2689 | S: Maintained | 2689 | S: Maintained |
| 2690 | 2690 | ||
| 2691 | PARALLEL PORT SUPPORT | 2691 | PARALLEL PORT SUPPORT |
| 2692 | L: linux-parport@lists.infradead.org | 2692 | L: linux-parport@lists.infradead.org (subscribers-only) |
| 2693 | S: Orphan | 2693 | S: Orphan |
| 2694 | 2694 | ||
| 2695 | PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES | 2695 | PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES |
| 2696 | P: Tim Waugh | 2696 | P: Tim Waugh |
| 2697 | M: tim@cyberelk.net | 2697 | M: tim@cyberelk.net |
| 2698 | L: linux-parport@lists.infradead.org | 2698 | L: linux-parport@lists.infradead.org (subscribers-only) |
| 2699 | W: http://www.torque.net/linux-pp.html | 2699 | W: http://www.torque.net/linux-pp.html |
| 2700 | S: Maintained | 2700 | S: Maintained |
| 2701 | 2701 | ||