diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 19:48:40 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 19:48:40 +0100 |
commit | ef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5 (patch) | |
tree | 1f1aa59e1aeeda48f0fdb0b17d40a9fb6b5e191d /include/net/sock.h | |
parent | Merge tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Btrfs: update the MAINTAINERS file (diff) | |
download | linux-ef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5.tar.xz linux-ef1e4e32d595d3e6c9a6d3d2956f087d5886c5e5.zip |
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
Diffstat (limited to 'include/net/sock.h')
0 files changed, 0 insertions, 0 deletions