diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 20:02:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 20:02:51 -0800 |
| commit | 271bf66d4c0c8db29764d241e4e46883d9c0a198 (patch) | |
| tree | 321c2fdda67bf5db87d12f11cde3c41492bbf213 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
| parent | ceph: simplify ceph_{get,init}_acl (diff) | |
| download | linux-dev-271bf66d4c0c8db29764d241e4e46883d9c0a198.tar.xz linux-dev-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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions