X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=MAINTAINERS;h=db65b4e6d1324b65b58db7e70174d1ee9e1bfe93;hb=5b058bcde961bf28678a70e44c079107313543b6;hp=0ea3a6d987149dfd7113b2ada91097b21aaefb6d;hpb=4c098bcd55fad34dcf224bf8343db6a9ac58fc68;p=sfrench%2Fcifs-2.6.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ea3a6d98714..db65b4e6d132 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1202,6 +1202,8 @@ S:	Supported
 CONTROL GROUPS (CGROUPS)
 P:	Paul Menage
 M:	menage@google.com
+P:	Li Zefan
+M:	lizf@cn.fujitsu.com
 L:	containers@lists.linux-foundation.org
 S:	Maintained
 
@@ -3537,6 +3539,12 @@ S:	Maintained
 PXA MMCI DRIVER
 S:	Orphan
 
+PXA RTC DRIVER
+P:	Robert Jarzmik
+M:	robert.jarzmik@free.fr
+L:	rtc-linux@googlegroups.com
+S:	Maintained
+
 QLOGIC QLA2XXX FC-SCSI DRIVER
 P:	Andrew Vasquez
 M:	linux-driver@qlogic.com
@@ -4285,8 +4293,8 @@ P:	Rajiv Andrade
 M:	srajiv@linux.vnet.ibm.com
 W:	http://tpmdd.sourceforge.net
 P:	Marcel Selhorst
-M:	tpm@selhorst.net
-W:	http://www.prosec.rub.de/tpm/
+M:	m.selhorst@sirrix.com
+W:	http://www.sirrix.com
 L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:	Maintained