Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1e4e32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 59fb2f0e c0778e25

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -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/