Merge commit 'v2.6.29-rc4' into tracing/core

1 files changed, 10 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 829a697f1235..4486ac1ccac5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1021,6 +1021,14 @@ M:	mb@bu3sch.de
 W:      http://bu3sch.de/btgpio.php
 S:      Maintained
 
+BTRFS FILE SYSTEM
+P:      Chris Mason
+M:      chris.mason@oracle.com
+L:      linux-btrfs@vger.kernel.org
+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:      mchehab@infradead.org
@@ -2212,7 +2220,7 @@ P:	Sean Hefty
 M:      sean.hefty@intel.com
 P:      Hal Rosenstock
 M:      hal.rosenstock@gmail.com
-L:      general@lists.openfabrics.org
+L:      general@lists.openfabrics.org (moderated for non-subscribers)
 W:      http://www.openib.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:      Supported
@@ -4847,6 +4855,7 @@ P:	Ingo Molnar
 M:      mingo@redhat.com
 P:      H. Peter Anvin
 M:      hpa@zytor.com
+M:      x86@kernel.org
 L:      linux-kernel@vger.kernel.org
 T:      git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:      Maintained