Merge commit 'origin/urcu/ht' into urcu/ht

Conflicts:

	urcu-ht.c

diff --cc urcu-ht.c
index e598e4533e01657c0e13f5b8158dd613a986b399,7213c39ce1414d788149dc864f9114bcb814acb0..3b9012d490107d4afb2a05aee0a008dca189ce6e
--- 1/urcu-ht.c
--- 2/urcu-ht.c
+++ b/urcu-ht.c
@@@ -5,17 -5,20 +5,22 @@@
  
  #define _LGPL_SOURCE
  #include <stdlib.h>
+ #include <errno.h>
+ #include <assert.h>
+ #include <stdio.h>
+ 
  #include <urcu.h>
+ #include <urcu-defer.h>
  #include <arch.h>
  #include <arch_atomic.h>
- #include <assert.h>
  #include <compiler.h>
- #include <urcu-defer.h>
- #include <errno.h>
- #include <urcu-ht.h>
  #include <urcu/jhash.h>
 +#include <stdio.h>
 +#include <pthread.h>
+ #include <urcu-ht.h>
+ 
+ /* node flags */
+ #define       NODE_STOLEN     (1 << 0)
  
  struct rcu_ht_node;