projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa2e710 7585823)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 04:02:51 +0000 (20:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 04:02:51 +0000 (20:02 -0800)
commit271bf66d4c0c8db29764d241e4e46883d9c0a198
tree321c2fdda67bf5db87d12f11cde3c41492bbf213tree | snapshot
parentaa2e7100e38880db7907cb2b7ec6267b2b243771commit | diff
parent758582361976e9640a1cb9516c0af10cdf8e4753commit | diff
Merge branch 'for-linus' of git://git./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
Domain: System / Kernel;