switch to CM Kernel and fix a typo

Conflicts:
	BoardConfig.mk

Change-Id: I623f1f83d1f8665f1bdfa90869a4a824e417a6e9