Merge branch 'master' into urcu/ht-shrink
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 5 Dec 2011 23:37:50 +0000 (18:37 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 5 Dec 2011 23:37:50 +0000 (18:37 -0500)
commit6e464eba97cf74320fe4e2b8da6dbe5039582948
tree0b5e3b23039f9b22d62b1669b928de3ed164849c
parent5a2141a73185fb1aaaceb73f8239a7efb81c16e6
parent666d90e83ac54a45f3cded53835f6aabda6e2484
Merge branch 'master' into urcu/ht-shrink

Conflicts:
Makefile.am
urcu-bp.c
Makefile.am
urcu-bp.c
urcu-bp.h
This page took 0.033332 seconds and 4 git commands to generate.