diff --git a/[refs] b/[refs]
index 2f50b410ee9c..969f0d295815 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67cde3448d951b55088a6ea3bb1aee0160068fb9
+refs/heads/master: 9c106405ddf893fcd04cd46555464417d2df8451
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index b36270986501..8bfa7f9d984d 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1630,11 +1630,11 @@ S:	Maintained
 F:	drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
-M:	Chris Mason <chris.mason@oracle.com>
+M:	Chris Mason <chris.mason@fusionio.com>
 L:	linux-btrfs@vger.kernel.org
 W:	http://btrfs.wiki.kernel.org/
 Q:	http://patchwork.kernel.org/project/linux-btrfs/list/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:	Maintained
 F:	Documentation/filesystems/btrfs.txt
 F:	fs/btrfs/