kernel changes
Merge branch 'cm-10.2' of ../../cyanogenmod-10.2/android_device_htc_ace-cm-10.2 into cd-4.3

Conflicts:
	BoardConfig.mk