diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 13:48:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 13:48:40 -0500 |
| commit | ef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5 (patch) | |
| tree | 1f1aa59e1aeeda48f0fdb0b17d40a9fb6b5e191d | |
| parent | 59fb2f0e9e30ad99a8bab0ff1efaf8f4a3b7105f (diff) | |
| parent | c0778e2534b81be6b85b5ee07c0e15ff774f7136 (diff) | |
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-- | MAINTAINERS | 3 |
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 | |||
| 1934 | F: drivers/gpio/gpio-bt8xx.c | 1934 | F: drivers/gpio/gpio-bt8xx.c |
| 1935 | 1935 | ||
| 1936 | BTRFS FILE SYSTEM | 1936 | BTRFS FILE SYSTEM |
| 1937 | M: Chris Mason <chris.mason@fusionio.com> | 1937 | M: Chris Mason <clm@fb.com> |
| 1938 | M: Josef Bacik <jbacik@fb.com> | ||
| 1938 | L: linux-btrfs@vger.kernel.org | 1939 | L: linux-btrfs@vger.kernel.org |
| 1939 | W: http://btrfs.wiki.kernel.org/ | 1940 | W: http://btrfs.wiki.kernel.org/ |
| 1940 | Q: http://patchwork.kernel.org/project/linux-btrfs/list/ | 1941 | Q: http://patchwork.kernel.org/project/linux-btrfs/list/ |