diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /MAINTAINERS | |
| parent | fd88de569b802c4a04aaa6ee74667775f4aed8c6 (diff) | |
| parent | d8c3291c73b958243b33f8509d4507e76dafd055 (diff) | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f4bd145c007e..c676253ef409 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1498,10 +1498,11 @@ L: netdev@vger.kernel.org | |||
| 1498 | S: Maintained | 1498 | S: Maintained |
| 1499 | 1499 | ||
| 1500 | IRDA SUBSYSTEM | 1500 | IRDA SUBSYSTEM |
| 1501 | P: Jean Tourrilhes | 1501 | P: Samuel Ortiz |
| 1502 | M: samuel@sortiz.org | ||
| 1502 | L: irda-users@lists.sourceforge.net (subscribers-only) | 1503 | L: irda-users@lists.sourceforge.net (subscribers-only) |
| 1503 | W: http://irda.sourceforge.net/ | 1504 | W: http://irda.sourceforge.net/ |
| 1504 | S: Odd Fixes | 1505 | S: Maintained |
| 1505 | 1506 | ||
| 1506 | ISAPNP | 1507 | ISAPNP |
| 1507 | P: Jaroslav Kysela | 1508 | P: Jaroslav Kysela |