| commit | 92bb062fe36132a04c6dc8b3c51c945730b05224 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 29 19:58:58 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 29 19:58:58 2011 -0700 |
| tree | fbce384d5ac6ced74a009b1b8eb212bc1696112b | |
| parent | 7409b7132ca96d01b373541d788e8c5893bec1f3 [diff] | |
| parent | 8adc8b3d780363d5df0dd6ace10336e3d7e331a1 [diff] |
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