Merge branch 'akpm' (patchbomb from Andrew)

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0d6469a..079efaf 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2528,8 +2528,7 @@ M:        Steve French <sfrench@samba.org>
 L:     linux-cifs@vger.kernel.org
 L:     samba-technical@lists.samba.org (moderated for non-subscribers)
 W:     http://linux-cifs.samba.org/
-Q:     http://patchwork.ozlabs.org/project/linux-cifs-client/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
+T:     git git://git.samba.org/sfrench/cifs-2.6.git
 S:     Supported
 F:     Documentation/filesystems/cifs/
 F:     fs/cifs/
@@ -2606,7 +2605,7 @@ L:        cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/memcontrol.c
-F:     mm/page_cgroup.c
+F:     mm/swap_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:     Fenghua Yu <fenghua.yu@intel.com>
@@ -2723,7 +2722,7 @@ F:        drivers/net/wireless/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
+L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
@@ -5209,7 +5208,7 @@ F:        drivers/media/tuners/it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
-L:     ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
+L:     ivtv-devel@ivtvdriver.org (subscribers-only)
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://www.ivtvdriver.org