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

Conflicts:
	Makefile
	drivers/misc/bln.c
defconfig: Make it "universal"