Fix some assertions
Merge branch 'master' of https://github.com/pocl/pocl
Event: modify macros to take parameters, fix event update in tce and pthread
Remove unneeded status update for event in clEnqueueUnmapMemObject
Merge branch 'master' of https://github.com/pocl/pocl

Conflicts:
	lib/CL/clEnqueueMapImage.c
	lib/CL/clFinish.c
Merge branch 'master' of https://github.com/pocl/pocl

Conflicts:
	lib/CL/clEnqueueWriteBuffer.c
	lib/CL/clFinish.c
	lib/CL/pocl_cl.h
Merge branch 'master' of https://github.com/pocl/pocl
Fix merge with master
Merge branch 'master' of https://github.com/pocl/pocl
Merge branch 'master' of https://github.com/pocl/pocl

Conflicts:
	lib/CL/clFinish.c
Book samples: fix test SimpleBufferSubBuffer
Book samples: patch ImageFilter2D with constant qualifier for global array
Enable book samples also with the ICD build.
Merge branch 'fix_booksamples' of https://github.com/clementleger/pocl
Binary test is broken with LLVM API mode.
Fix HelloBinaryWorld of the book samples.
Event: fix event status for FillImage and EnqueueMarkerWithWaitList
Merge branch 'master' of https://github.com/pocl/pocl
Devices: Init long_name from short name if not assigned
Put _kernel.h in the correct path

Previously _kernel.h landed in pkgincludedir instead of in
pkgdatadir/include. The rationale behind this is, that headers required
by pocl should go to pkgdatadir/include, where as headers required by
3rd parties to build against pocl go into pkgcinludedir.

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>