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

Merge branch 'master' into urcu/ht

Conflicts:
	Makefile.inc
	tests/Makefile.inc
	urcu-defer.h
---

bc2433a9853a945a825c244e9ccfe341b73b2ceb