From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 2 Nov 2011 00:15:55 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~65
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=cc6b0c208a9707f8a64609a51167290caeace288;p=userspace-rcu.git

Merge branch 'master' into urcu/ht-shrink

Fixed conflicts:
	tests/test_urcu_qsbr.c
	tests/test_urcu_qsbr_gc.c

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

cc6b0c208a9707f8a64609a51167290caeace288