projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7409b71 8adc8b3)
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)
* '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


Trivial merge