From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Feb 2011 23:01:38 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v2.6.38-rc6~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8bd89ca22010847e85de37b77d9f19f16b1962ad;p=users%2Fjedix%2Flinux-maple.git

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
---

8bd89ca22010847e85de37b77d9f19f16b1962ad