diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:58:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:58:58 -0700 |
commit | 92bb062fe36132a04c6dc8b3c51c945730b05224 (patch) | |
tree | fbce384d5ac6ced74a009b1b8eb212bc1696112b /init | |
parent | 7409b7132ca96d01b373541d788e8c5893bec1f3 (diff) | |
parent | 8adc8b3d780363d5df0dd6ace10336e3d7e331a1 (diff) | |
download | linux-92bb062fe36132a04c6dc8b3c51c945730b05224.tar.gz linux-92bb062fe36132a04c6dc8b3c51c945730b05224.tar.bz2 linux-92bb062fe36132a04c6dc8b3c51c945730b05224.zip |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions