Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d992d407197b726033a88797af6963082bc9b1e3..db65b4e6d1324b65b58db7e70174d1ee9e1bfe93 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -911,7 +911,7 @@ S:  Maintained
 BLACKFIN ARCHITECTURE
 P:     Bryan Wu
 M:     [email protected]
-L:     [email protected] (subscribers-only)
+L:     [email protected]
 W:     http://blackfin.uclinux.org
 S:     Supported
 
@@ -1021,6 +1021,14 @@ M:       [email protected]
 W:     http://bu3sch.de/btgpio.php
 S:     Maintained
 
+BTRFS FILE SYSTEM
+P:     Chris Mason
+M:     [email protected]
+L:     [email protected]
+W:     http://btrfs.wiki.kernel.org/
+T:     git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
+S:     Maintained
+
 BTTV VIDEO4LINUX DRIVER
 P:     Mauro Carvalho Chehab
 M:     [email protected]
@@ -1194,6 +1202,8 @@ S:        Supported
 CONTROL GROUPS (CGROUPS)
 P:     Paul Menage
 M:     [email protected]
+P:     Li Zefan
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 
@@ -2212,7 +2222,7 @@ P:        Sean Hefty
 M:     [email protected]
 P:     Hal Rosenstock
 M:     [email protected]
-L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 W:     http://www.openib.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
@@ -2836,8 +2846,6 @@ S:        Maintained
 MAC80211
 P:     Johannes Berg
 M:     [email protected]
-P:     Michael Wu
-M:     [email protected]
 L:     [email protected]
 W:     http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -3531,6 +3539,12 @@ S:       Maintained
 PXA MMCI DRIVER
 S:     Orphan
 
+PXA RTC DRIVER
+P:     Robert Jarzmik
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 QLOGIC QLA2XXX FC-SCSI DRIVER
 P:     Andrew Vasquez
 M:     [email protected]
@@ -4279,8 +4293,8 @@ P:        Rajiv Andrade
 M:     [email protected]
 W:     http://tpmdd.sourceforge.net
 P:     Marcel Selhorst
-M:     [email protected]
-W:     http://www.prosec.rub.de/tpm/
+M:     [email protected]
+W:     http://www.sirrix.com
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 
@@ -4843,6 +4857,7 @@ P:        Ingo Molnar
 M:     [email protected]
 P:     H. Peter Anvin
 M:     [email protected]
+M:     [email protected]
 L:     [email protected]
 T:     git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:     Maintained