]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:58:58 +0000 (19:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2011 02:58:58 +0000 (19:58 -0700)
commitbdc05c122c54c9fc866670463748d8697d08148d
treefbce384d5ac6ced74a009b1b8eb212bc1696112b
parent3f9bc11c6042d37f7b5131df800d3ca7e0184c66
parente566d91c8c75ec7c4e3f6b15bed3ac6670144550
Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client

* 'for-linus' of git://github.com/NewDreamNetwork/ceph-client:
  libceph: fix pg_temp mapping update
  libceph: fix pg_temp mapping calculation
  libceph: fix linger request requeuing
  libceph: fix parse options memory leak
  libceph: initialize ack_stamp to avoid unnecessary connection reset