Merge remote-tracking branch 'rq/cm-11.0' into ose

Conflicts:
	BoardConfig.mk
	init/init_ghost.c