diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /MAINTAINERS | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c67c3e338105..e42e14335194 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1694,10 +1694,8 @@ L: linux-kernel@vger.kernel.org | |||
| 1694 | S: Maintained | 1694 | S: Maintained |
| 1695 | 1695 | ||
| 1696 | LAPB module | 1696 | LAPB module |
| 1697 | P: Henner Eisen | ||
| 1698 | M: eis@baty.hanse.de | ||
| 1699 | L: linux-x25@vger.kernel.org | 1697 | L: linux-x25@vger.kernel.org |
| 1700 | S: Maintained | 1698 | S: Orphan |
| 1701 | 1699 | ||
| 1702 | LASI 53c700 driver for PARISC | 1700 | LASI 53c700 driver for PARISC |
| 1703 | P: James E.J. Bottomley | 1701 | P: James E.J. Bottomley |