From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jan 2014 04:02:51 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: Ubuntu-5.2.0-15.16~14081
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=271bf66d4c0c8db29764d241e4e46883d9c0a198;p=mirror_ubuntu-eoan-kernel.git

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
---

271bf66d4c0c8db29764d241e4e46883d9c0a198