]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81b6934 0474a2e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 18:21:50 +0000 (11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 18:21:50 +0000 (11:21 -0700)
commit15f8871ed39e0c05fb752b860a1ec60685c5fe90
tree4c7b06a4df4e3fc18e63df33230080a419f7c606tree | snapshot
parent81b6934719b7041f5cb740da49fd7233032257c3commit | diff
parent0474a2e546f525985ef83f642c5ae8f8f53c6700commit | 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
Linux Kernel Source Tree.