tree fdb12c5ca073bd444d9d64dee3f8e34b323aebda
parent 47126d807ab1ef24e0f02dcca20883e275198fe2
parent 38be7a79f7c99dd01425f19ef6cf744878b6a94b
author Linus Torvalds <torvalds@linux-foundation.org> 1311138628 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311138628 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix file mode calculation