projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80dadf8 0c1f91f)
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)
commitffdb8f1bfbd9cef1394f5d3c4a774015d4ac0f97
tree4c7b06a4df4e3fc18e63df33230080a419f7c606tree | snapshot
parent80dadf86d607bc5f25cc384ac590ef8b49ae523acommit | diff
parent0c1f91f27140cf3b6e38dc4e892adac241c73a20commit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree