ip6tnl: advertise tunnel param via rtnl

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e73060fe07888916a358331744397a1257cd1696..2463a0a8d3e57e07c6b51b9f1f165ff221f0183c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3869,7 +3869,9 @@ M:        Greg Rose <[email protected]>
 M:     Peter P Waskiewicz Jr <[email protected]>
 M:     Alex Duyck <[email protected]>
 M:     John Ronciak <[email protected]>
+M:     Tushar Dave <[email protected]>
 L:     [email protected]
+W:     http://www.intel.com/support/feedback.htm
 W:     http://e1000.sourceforge.net/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
@@ -4372,7 +4374,7 @@ F:        Documentation/scsi/53c700.txt
 F:     drivers/scsi/53c700*
 
 LED SUBSYSTEM
-M:     Bryan Wu <bryan.wu@canonical.com>
+M:     Bryan Wu <cooloney@gmail.com>
 M:     Richard Purdie <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@@ -5019,6 +5021,20 @@ F:       net/ipv6/
 F:     include/net/ip*
 F:     arch/x86/net/*
 
+NETWORKING [IPSEC]
+M:     Steffen Klassert <[email protected]>
+M:     Herbert Xu <[email protected]>
+M:     "David S. Miller" <[email protected]>
+L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+S:     Maintained
+F:     net/xfrm/
+F:     net/key/
+F:     net/ipv4/xfrm*
+F:     net/ipv6/xfrm*
+F:     include/uapi/linux/xfrm.h
+F:     include/net/xfrm.h
+
 NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 M:     Paul Moore <[email protected]>
 L:     [email protected]
@@ -6336,6 +6352,7 @@ F:        drivers/scsi/st*
 SCTP PROTOCOL
 M:     Vlad Yasevich <[email protected]>
 M:     Sridhar Samudrala <[email protected]>
+M:     Neil Horman <[email protected]>
 L:     [email protected]
 W:     http://lksctp.sourceforge.net
 S:     Maintained