tree fbce384d5ac6ced74a009b1b8eb212bc1696112b
parent 7409b7132ca96d01b373541d788e8c5893bec1f3
parent 8adc8b3d780363d5df0dd6ace10336e3d7e331a1
author Linus Torvalds <torvalds@linux-foundation.org> 1317351538 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317351538 -0700

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