From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 5 Dec 2011 23:41:49 +0000 (-0500)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~20
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1644042068ae8de26c9f6b85dcb2a5cd0b0f7608;p=urcu.git

Merge branch 'master' into urcu/ht-shrink
---

1644042068ae8de26c9f6b85dcb2a5cd0b0f7608