| commit | ffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 13 11:21:50 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 13 11:21:50 2011 -0700 |
| tree | 4c7b06a4df4e3fc18e63df33230080a419f7c606 | |
| parent | 80dadf86d607bc5f25cc384ac590ef8b49ae523a [diff] | |
| parent | 0c1f91f27140cf3b6e38dc4e892adac241c73a20 [diff] |
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