Merge branch 'cm-11.0' of https://github.com/zwliew/Samsung_STE_Kernel into kitkat2

Conflicts:
	Makefile
	arch/arm/configs/cyanogenmod_i8160_defconfig
defconfig: janice up-to-date as per codina