rtapi/shmdrv.h: fix CR in line endings
rtapi_msgd, rtapi_app: add gcc version, git version to startup log message
Merge branch 'ub-reorder-startup-rebase' into tmp
Merge branch 'rtos-integration-preview3'

Conflicts:
	.gitignore
	src/Makefile
	src/Makefile.modinc.in
	src/emc/task/Submakefile
	src/hal/drivers/mesa-hostmot2/mesa_7i64.c
	src/hal/drivers/mesa-hostmot2/mesa_8i20.c
	src/hal/drivers/mesa-hostmot2/mesa_autoconf.c
	src/hal/utils/halcmd_commands.c
	src/rtapi/Submakefile
	src/rtapi/rtai_rtapi.c
	src/rtapi/vsnprintf.h
Fixed up new hostmot2 files and added some missing type support to module.h
Merge branch 'rtos-integration-preview3' into rtos-integration-preview3-merged-into-master
rtapi: add back in vsnprintf.h and test
rtapi_limits.h:  adapt to new configure symbols

SIM doesnt exist anymore
Merge remote-tracking branch 'mah/v2.5_branch' into rtos-integration-preview3-merged-into-master
rtapi_common.h:  no need to define NULL; this is taken care of in rtapi.h
Silence compiler warnings, mostly from printing size_t on 64-bit arch
Merge branch 'rtos-integration-preview3-merged-into-master' of git.mah.priv.at:emc2-dev into rtos-integration-preview3-merged-into-master

Conflicts:
	debian/control.in
	src/Makefile
redis: fix mutual dependency
rtapi_delay: provide hooks for rt-preempt-user, xenomai user/kernel,rtai
rtapi_delay():  move to RTAPI only; rtapi_delay_hook() mandatory
fix typo
Merge branch 'rtos-integration-preview3-merged-into-master'

Conflicts:
	.gitignore
	debian/control.in
	src/Makefile
	src/Makefile.modinc.in
	src/emc/task/Submakefile
	src/hal/drivers/mesa-hostmot2/mesa_7i64.c
	src/hal/drivers/mesa-hostmot2/mesa_8i20.c
	src/hal/drivers/mesa-hostmot2/mesa_autoconf.c
	src/hal/utils/halcmd_commands.c
	src/rtapi/Submakefile
	src/rtapi/rtai_rtapi.c
	src/rtapi/vsnprintf.h
Merge branch 'master' of git://git.linuxcnc.org/git/emc2
Merge branch 'master' into rtos-integration-preview3-merged-into-master

Conflicts:
	.gitignore
	debian/control.in
	src/Makefile
	src/Makefile.modinc.in
	src/hal/utils/halcmd_commands.c
	src/rtapi/Submakefile
Merge branch 'rtos-integration-preview3' into rtos-integration-preview3-merged-into-master