diff --git a/[refs] b/[refs]
index eb11fb5815aa..e240269aa121 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44670d2b50efd2443c3810239d6ea3fd02f8ef64
+refs/heads/master: 4230dfc9c3f708f4765736b862aa313aa97e3c2e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 302b31960008..866485b71e38 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1803,8 +1803,9 @@ M:	greg@kroah.com
 S:	Maintained
 
 PCMCIA SUBSYSTEM
+P:	Linux PCMCIA Team
 L:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia
-S:	Unmaintained
+S:	Maintained
 
 PCNET32 NETWORK DRIVER
 P:	Thomas Bogendörfer