merge fixes

--Ths lin, and those below, will be ignored--

M    sched_ctx_hypervisor/examples/cholesky/cholesky_kernels.c
M    sched_ctx_hypervisor/examples/cholesky/cholesky_implicit.c
M    sched_ctx_hypervisor/examples/Makefile.am

sched_ctx_hypervisor/examples/Makefile.am

@@ -23,7 +23,7 @@ noinst_HEADERS = 				\
 	sched_ctx_utils/sched_ctx_utils.h
 endif
 
-AM_LDFLAGS = $(top_builddir)/src/libstarpu.la 
+AM_LDFLAGS = $(top_builddir)/src/libstarpu-1.0.la 
 
 LIBS = $(top_srcdir)/sched_ctx_hypervisor/src/libsched_ctx_hypervisor.la
 

sched_ctx_hypervisor/examples/cholesky/cholesky_implicit.c

@@ -17,7 +17,7 @@
  */
 
 #include "cholesky.h"
-
+#include "../sched_ctx_utils/sched_ctx_utils.h"
 /*
  *	Create the codelets
  */
@@ -72,6 +72,7 @@ static void callback_turn_spmd_on(void *arg __attribute__ ((unused)))
 	cl22.type = STARPU_SPMD;
 }
 
+int hypervisor_tag = 1;
 static void _cholesky(starpu_data_handle_t dataA, unsigned nblocks)
 {
 	int ret;

sched_ctx_hypervisor/examples/cholesky/cholesky_kernels.c

@@ -17,7 +17,7 @@
 
 #include <starpu_config.h>
 #include "cholesky.h"
-#include "../common/blas.h"
+//#include "../common/blas.h"
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>
 #ifdef STARPU_HAVE_MAGMA