Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:28 +0000 (22:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 05:10:28 +0000 (22:10 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix file mode calculation


Trivial merge