]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/scsi/scsi_netlink.c
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)
commit8bd89ca22010847e85de37b77d9f19f16b1962ad
tree0bcee2ae6a85443177a6d95ed960301e0f4c9d57
parentb08b69a110bd981909c248f89997dcdcdfd5a39c
parent97d79b403ef03f729883246208ef5d8a2ebc4d68
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