]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Feb 2011 23:01:38 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Feb 2011 23:01:38 +0000 (15:01 -0800)
commit2c2004d84b7e3ff32a9146ecdc1ba70575768517
tree0bcee2ae6a85443177a6d95ed960301e0f4c9d57
parent84fef05042e9ce36f7d59c2d92893d1edde761a0
parent096794ed54d4e8831eb104061d9270d3a5b1b035
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
fs/ceph/dir.c
fs/ceph/super.h