diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-24 17:57:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-24 17:57:16 -0800 |
| commit | 323dbaba2cfab170c656f5d68986ff0ced5b421c (patch) | |
| tree | 99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 /MAINTAINERS | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 36c7bc641db..2333255417f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3884,10 +3884,13 @@ M: trivial@kernel.org L: linux-kernel@vger.kernel.org S: Maintained -TULIP NETWORK DRIVER -L: tulip-users@lists.sourceforge.net -W: http://sourceforge.net/projects/tulip/ -S: Orphan +TULIP NETWORK DRIVERS +P: Grant Grundler +M: grundler@parisc-linux.org +P: Kyle McMartin +M: kyle@parisc-linux.org +L: netdev@vger.kernel.org +S: Maintained TUN/TAP driver P: Maxim Krasnyansky |