summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-31 08:59:59 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-31 08:59:59 -0400
commitb1b934d31d8a608fe69fc56d6e539548b55b0601 (patch)
treee8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /MAINTAINERS
parent5dd9feafb351a8bf304292623cbc63335c34d279 (diff)
parentb6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff)
downloadlinux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.gz
linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.bz2
linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.zip
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
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
S: Maintained
LAPB module
-P: Henner Eisen
-M: eis@baty.hanse.de
L: linux-x25@vger.kernel.org
-S: Maintained
+S: Orphan
LASI 53c700 driver for PARISC
P: James E.J. Bottomley