From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 1 Mar 2012 22:23:47 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2253b139ffb6a4eca7291b60083cc5206a6e128d;p=lttng-ust.git

Merge branch 'master' into dev

Conflicts:
	liblttng-ust/ltt-events.c
	liblttng-ust/lttng-context-vtid.c
	liblttng-ust/lttng-ust-comm.c
	libringbuffer/ring_buffer_frontend.c

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

2253b139ffb6a4eca7291b60083cc5206a6e128d