From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 6 Jul 2011 01:02:11 +0000 (-0400)
Subject: Merge remote branch 'origin/urcu/ht' into urcu/ht
X-Git-Tag: v0.7.0~43^2~231
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9d2614f07691a813a3c560a6c0bcd0a7be854ed5;p=userspace-rcu.git

Merge remote branch 'origin/urcu/ht' into urcu/ht

Conflicts:
	urcu-ht.h
---

9d2614f07691a813a3c560a6c0bcd0a7be854ed5