tree 3dfd66dce28b3b02f7e293b28b57191ca23f691c
parent 0ffe37de76a57ba38d960e370c2f8f1d799c94a1
parent be4f104dfd3b5e3ae262bff607965cfc38027dec
author Linus Torvalds <torvalds@linux-foundation.org> 1285093210 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285093210 -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: select CRYPTO
  ceph: check mapping to determine if FILE_CACHE cap is used
  ceph: only send one flushsnap per cap_snap per mds session
  ceph: fix cap_snap and realm split
  ceph: stop sending FLUSHSNAPs when we hit a dirty capsnap
  ceph: correctly set 'follows' in flushsnap messages
  ceph: fix dn offset during readdir_prepopulate
  ceph: fix file offset wrapping at 4GB on 32-bit archs
  ceph: fix reconnect encoding for old servers
  ceph: fix pagelist kunmap tail
  ceph: fix null pointer deref on anon root dentry release