1 files changed, 10 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e4dde7f1f8d2..48ca8b47150d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -167,11 +167,11 @@ S:	Maintained
 P:      Eric Van Hensbergen
 M:      ericvh@gmail.com
 P:      Ron Minnich
-M:      rminnich@lanl.gov
+M:      rminnich@sandia.gov
 P:      Latchesar Ionkov
 M:      lucho@ionkov.net
 L:      v9fs-developer@lists.sourceforge.net
-W:      http://v9fs.sf.net
+W:      http://swik.net/v9fs
 T:      git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
 S:      Maintained
 
@@ -1009,7 +1009,7 @@ P:	Steve French
 M:      sfrench@samba.org
 L:      linux-cifs-client@lists.samba.org
 L:      samba-technical@lists.samba.org
-W:      http://us1.samba.org/samba/Linux_CIFS_client.html
+W:      http://linux-cifs.samba.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:      Supported
 
@@ -2661,6 +2661,12 @@ L:	netdev@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:      Maintained
 
+NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
+P:      Paul Moore
+M:      paul.moore@hp.com
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 NETWORKING [WIRELESS]
 P:      John W. Linville
 M:      linville@tuxdriver.com
@@ -3452,7 +3458,7 @@ S:	Maintained
 
 TPM DEVICE DRIVER
 P:      Kylene Hall
-M:      kjhall@us.ibm.com
+M:      tpmdd-devel@lists.sourceforge.net
 W:      http://tpmdd.sourceforge.net
 P:      Marcel Selhorst
 M:      tpm@selhorst.net