Merged changes by Martin Troxler.

include/ecrt.h

lib/master.c

master/Kbuild.in

master/Makefile.am

master/cdev.c

master/fsm_master.c

master/fsm_master.h

master/fsm_sii.c

master/fsm_slave.c

master/fsm_slave.h

master/globals.h

master/ioctl.h

master/master.c

master/master.h

master/module.c

master/slave.c

master/slave.h