netns: place rt_genid into struct net

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 195c56f..5ae19d5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2147,6 +2147,8 @@ P:        Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Bruce Allan
 M:     bruce.w.allan@intel.com
+P:     PJ Waskiewicz
+M:     peter.p.waskiewicz.jr@intel.com
 P:     John Ronciak
 M:     john.ronciak@intel.com
 L:     e1000-devel@lists.sourceforge.net
@@ -3231,14 +3233,6 @@ L:       linux-kernel@vger.kernel.org
 T:     git git.infradead.org/battery-2.6.git
 S:     Maintained
 
-POWERPC 4xx EMAC DRIVER
-P:     Eugene Surovegin
-M:     ebs@ebshome.net
-W:     http://kernel.ebshome.net/emac/
-L:     linuxppc-dev@ozlabs.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-
 PNP SUPPORT
 P:     Adam Belay
 M:     ambx1@neo.rr.com
@@ -3860,10 +3854,6 @@ P:       Ion Badulescu
 M:     ionut@cs.columbia.edu
 S:     Maintained
 
-STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
-W:     http://mosquitonet.Stanford.EDU/strip.html
-S:     Unsupported ?
-
 STRADIS MPEG-2 DECODER DRIVER
 P:     Nathan Laredo
 M:     laredo@gnu.org