From: Linus Torvalds Date: Fri, 30 Sep 2011 02:58:58 +0000 (-0700) Subject: Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client X-Git-Tag: v3.1-rc9~15 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=92bb062fe36132a04c6dc8b3c51c945730b05224 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 --- 92bb062fe36132a04c6dc8b3c51c945730b05224