summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2013-12-03 20:16:03 -0500
committerChris Mason <clm@fb.com>2013-12-03 20:56:13 -0500
commitc0778e2534b81be6b85b5ee07c0e15ff774f7136 (patch)
tree4e9f4d6663e32ec594243015e964fa810370a60f
parentc75017961ba7df5da148b48a905c97181587d562 (diff)
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>
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
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/