diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:40:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:40:11 -0400 |
| commit | d11ea48aab3b57cc931cc7120603e1c2ffb04302 (patch) | |
| tree | dad3c780816d0a76e021ee53c49c7c1fb4dd1243 /MAINTAINERS | |
| parent | 22ad852b8297e5063fc50f54a77e13f6d9b16a6f (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
| download | linux-d11ea48aab3b57cc931cc7120603e1c2ffb04302.tar.gz linux-d11ea48aab3b57cc931cc7120603e1c2ffb04302.tar.bz2 linux-d11ea48aab3b57cc931cc7120603e1c2ffb04302.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e99028ca2f7c..b2afc7ae965b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1676,10 +1676,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 |