Merge branch 'master' into urcu/ht
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sat, 2 Jul 2011 15:24:18 +0000 (11:24 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sat, 2 Jul 2011 15:24:18 +0000 (11:24 -0400)
commitbc2433a9853a945a825c244e9ccfe341b73b2ceb
tree9827f3376b94badd78af6cbc559389db82a0aa9b
parent1e52eccf3cb657dccb197132f7cb47b683902538
parentc5f52d0c6b1890f0c66f172665ae6793634f5287
Merge branch 'master' into urcu/ht

Conflicts:
Makefile.inc
tests/Makefile.inc
urcu-defer.h
This page took 0.030402 seconds and 4 git commands to generate.