Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
commite6625fa48e6580a74b7e700efd7e6463e282810b
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:28 +0000 (19 22:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:28 +0000 (19 22:10 -0700)
treefdb12c5ca073bd444d9d64dee3f8e34b323aebda
parent47126d807ab1ef24e0f02dcca20883e275198fe2
parent38be7a79f7c99dd01425f19ef6cf744878b6a94b
Merge branch 'for-linus' of git://git./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