projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c08232 fca65b4)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:22:20 +0000 (14:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:22:20 +0000 (14:22 -0700)
commitbd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f
treeb88b57915ccc335cb1391abf3da5fa59bd5e6ac5tree | snapshot
parent1c08232cfe5e68c6234305a3abb64d52d89c9eadcommit | diff
parentfca65b4ad72d28cbb43a029114d04b89f06faadbcommit | 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: do not call __mark_dirty_inode under i_lock
  libceph: fix ceph_osdc_alloc_request error checks
  ceph: handle ceph_osdc_new_request failure in ceph_writepages_start
  libceph: fix ceph_msg_new error path
  ceph: use ihold() when i_lock is held
John Crispins staging tree