summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-05 10:48:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-05 10:48:40 -0800
commitef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5 (patch)
tree1f1aa59e1aeeda48f0fdb0b17d40a9fb6b5e191d
parent59fb2f0e9e30ad99a8bab0ff1efaf8f4a3b7105f (diff)
parentc0778e2534b81be6b85b5ee07c0e15ff774f7136 (diff)
downloadlinux-ef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5.tar.bz2
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs MAINTAINERS file update: "I'm still getting settled into new devel hardware etc, but I do have one commit for the next rc. This changes my email over to fb.com, and adds a MAINTAINERS entry for Josef as well" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: update the MAINTAINERS file
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4afcfb4c892b..926b0e1efca0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1934,7 +1934,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/