From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 2 Oct 2011 16:56:36 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~102
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f96d597f3a04010d432c36b9bb07e910720000ab;p=urcu.git

Merge branch 'master' into urcu/ht-shrink

Conflicts:
	urcu-call-rcu.h

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

f96d597f3a04010d432c36b9bb07e910720000ab