summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-31 05:02:51 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-31 05:02:51 +0100
commit271bf66d4c0c8db29764d241e4e46883d9c0a198 (patch)
tree321c2fdda67bf5db87d12f11cde3c41492bbf213 /MAINTAINERS
parentMerge branch 'akpm' (patches from Andrew Morton) (diff)
parentceph: simplify ceph_{get,init}_acl (diff)
downloadlinux-271bf66d4c0c8db29764d241e4e46883d9c0a198.tar.xz
linux-271bf66d4c0c8db29764d241e4e46883d9c0a198.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull some further ceph acl cleanups from Sage Weil: "I do have a couple patches on top of what's in your tree, though, that clean up a couple duplicated lines in your fix and apply Christoph's cleanup" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: simplify ceph_{get,init}_acl ceph: remove duplicate declaration of ceph_setattr
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions