diff --git a/[refs] b/[refs] index 4d11cb64fbb6..7f6e4a4f3f30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cb5e57701d355737f0bc9f94c0f80ed69a95b62 +refs/heads/master: 740db6d7f5bf194abf327613a5a500e3729fc19a diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 36c7bc641dba..2333255417f4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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