| commit | 271bf66d4c0c8db29764d241e4e46883d9c0a198 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 30 20:02:51 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 30 20:02:51 2014 -0800 |
| tree | 321c2fdda67bf5db87d12f11cde3c41492bbf213 | |
| parent | aa2e7100e38880db7907cb2b7ec6267b2b243771 [diff] | |
| parent | 758582361976e9640a1cb9516c0af10cdf8e4753 [diff] |
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