projects / userspace-rcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc35de0 f9da093)
Merge branch 'master' into urcu/ht-shrink
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 2 Oct 2011 16:56:36 +0000 (12:56 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 2 Oct 2011 16:56:36 +0000 (12:56 -0400)
Conflicts:
urcu-call-rcu.h

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

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