projects / userspace-rcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f52427 a0b7f7e)
Merge branch 'master' into urcu/ht-shrink
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 2 Nov 2011 00:15:55 +0000 (20:15 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 2 Nov 2011 00:15:55 +0000 (20:15 -0400)
Fixed conflicts:
tests/test_urcu_qsbr.c
tests/test_urcu_qsbr_gc.c

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
1  2 
tests/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc tests/Makefile.am
Simple merge
Userspace RCU (urcu) for Linux
This page took 0.025678 seconds and 4 git commands to generate.