aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 11:21:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-13 11:21:50 -0700
commitffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97 (patch)
tree4c7b06a4df4e3fc18e63df33230080a419f7c606 /block
parent80dadf86d607bc5f25cc384ac590ef8b49ae523a (diff)
parent0c1f91f27140cf3b6e38dc4e892adac241c73a20 (diff)
downloadautogen-ffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97.tar.gz
autogen-ffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97.tar.xz
autogen-ffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97.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: unwind canceled flock state ceph: fix ENOENT logic in striped_read ceph: fix short sync reads from the OSD ceph: fix sync vs canceled write ceph: use ihold when we already have an inode ref
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions