From: Chris Mason <clm@fb.com>
Date: Wed, 4 Dec 2013 01:16:03 +0000 (-0500)
Subject: Btrfs: update the MAINTAINERS file
X-Git-Tag: v3.13-rc3~10^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0778e2534b81be6b85b5ee07c0e15ff774f7136;p=pandora-kernel.git

Btrfs: update the MAINTAINERS file

Josef and I have new email addresses

Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index ffcaf975bed7..db89b5df5779 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1921,7 +1921,8 @@ S:	Maintained
 F:	drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
-M:	Chris Mason <chris.mason@fusionio.com>
+M:	Chris Mason <clm@fb.com>
+M:	Josef Bacik <jbacik@fb.com>
 L:	linux-btrfs@vger.kernel.org
 W:	http://btrfs.wiki.kernel.org/
 Q:	http://patchwork.kernel.org/project/linux-btrfs/list/