tree 0bcee2ae6a85443177a6d95ed960301e0f4c9d57
parent b08b69a110bd981909c248f89997dcdcdfd5a39c
parent 97d79b403ef03f729883246208ef5d8a2ebc4d68
author Linus Torvalds <torvalds@linux-foundation.org> 1298329298 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1298329298 -0800

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: keep reference to parent inode on ceph_dentry
  ceph: queue cap_snaps once per realm
  libceph: fix socket write error handling
  libceph: fix socket read error handling