tree 6bd52203d0d071acd3311d5093b4aa61c313faad
parent 8b8ce8810b092cef35e15af6577ad569f6145c0a
parent 153a10939ea6e42e9c0115b0645060d0d7bb4697
author Linus Torvalds <torvalds@linux-foundation.org> 1278461715 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278461715 -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 crush device 'out' threshold to 1.0, not 0.1
  ceph: fix caps usage accounting for import (non-reserved) case
  ceph: only release clean, unused caps with mds requests
  ceph: fix crush CHOOSE_LEAF when type is already a leaf
  ceph: fix crush recursion
  ceph: fix caps debugfs entry
  ceph: delay umount until all mds requests drop inode+dentry refs
  ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate
  ceph: fix crush map update decoding
  ceph: fix message memory leak, uninitialized variable
  ceph: fix map handler error path
  ceph: some endianity fixes