diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 00:01:38 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 00:01:38 +0100 |
commit | 8bd89ca22010847e85de37b77d9f19f16b1962ad (patch) | |
tree | 0bcee2ae6a85443177a6d95ed960301e0f4c9d57 /firmware/myricom | |
parent | Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | ceph: keep reference to parent inode on ceph_dentry (diff) | |
download | linux-8bd89ca22010847e85de37b77d9f19f16b1962ad.tar.xz linux-8bd89ca22010847e85de37b77d9f19f16b1962ad.zip |
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
Diffstat (limited to 'firmware/myricom')
0 files changed, 0 insertions, 0 deletions