From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Wed, 17 Jun 2009 16:31:58 +0000 (-0400)
Subject: Merge branch 'master' of lttng.org:/home/git/userspace-rcu
X-Git-Tag: v0.1~144
X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=ed1289f1b3865b04eb268c26d310d08e19b4760b;hp=80f799291e6808304824944f86f407f0d68af8d4

Merge branch 'master' of lttng.org:/home/git/userspace-rcu
---

diff --git a/LICENSE b/LICENSE
index f02264e..4f3c5bb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -28,7 +28,7 @@ See lgpl-relicensing.txt for details.
 
 * MIT-style license :
 
-xchg() privimitive has been rewritten from scratch starting from atomic_ops 1.2
+xchg() primitive has been rewritten from scratch starting from atomic_ops 1.2
 which has a MIT-style license that is intended to allow use in both free and
 proprietary software:
 	http://www.hpl.hp.com/research/linux/atomic_ops/LICENSING.txt