From 3fc09306bc2c2d22224b3b5fef863542c700ec16 Mon Sep 17 00:00:00 2001 From: Ramkrishna Vepa Date: Wed, 1 Apr 2009 18:14:25 +0000 Subject: [PATCH] --- yaml --- r: 139783 b: refs/heads/master c: b136d1cbd4b0eedc4e120b14e6834354f7249c7e h: refs/heads/master i: 139781: ecc45c3e813e8b7696573060532aef2fcc6ed2fc 139779: 4601ef6ec7c004a43f517b9c1e5de4651b650da9 139775: 358f40954a177056b274ebff230831d79f0fd2c5 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ddf96d50fd8a..c707073405af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5adfb64bdd4eee07e0677cbad12a2f80fecc6715 +refs/heads/master: b136d1cbd4b0eedc4e120b14e6834354f7249c7e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 01243ce6d998..08a141b0ee91 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3111,7 +3111,7 @@ M: shemminger@linux-foundation.org L: netem@lists.linux-foundation.org S: Maintained -NETERION (S2IO) Xframe 10GbE DRIVER +NETERION (S2IO) 10GbE DRIVER (xframe/vxge) P: Ramkrishna Vepa M: ram.vepa@neterion.com P: Rastapur Santosh @@ -3120,8 +3120,11 @@ P: Sivakumar Subramani M: sivakumar.subramani@neterion.com P: Sreenivasa Honnur M: sreenivasa.honnur@neterion.com +P: Anil Murthy +M: anil.murthy@neterion.com L: netdev@vger.kernel.org -W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous +W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous +W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous S: Supported NETFILTER/IPTABLES/IPCHAINS