summaryrefslogtreecommitdiff
path: root/include/linux/nfs4.h
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 /include/linux/nfs4.h
parent59fb2f0e9e30ad99a8bab0ff1efaf8f4a3b7105f (diff)
parentc0778e2534b81be6b85b5ee07c0e15ff774f7136 (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
Diffstat (limited to 'include/linux/nfs4.h')
0 files changed, 0 insertions, 0 deletions