From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 9 Jan 2012 23:12:13 +0000 (-0500)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f8fc437722856fefd5d415405d5ce8d79e8b6e96;p=urcu.git

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

f8fc437722856fefd5d415405d5ce8d79e8b6e96