From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 13 Sep 2011 21:34:19 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink-help
X-Git-Tag: v0.7.0~43^2~153
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bce63dfd0a2306452c9e39f5df01789e77f3f44a;p=userspace-rcu.git

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

Conflicts:
	urcu-qsbr.c

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

bce63dfd0a2306452c9e39f5df01789e77f3f44a