Merge branch '3.0.31' of https://github.com/TeamCanjica/Samsung_STE_Kernel into 3.0.31
Revert "mm: Add UKSM 0.1.2.2"

This reverts commit 15f2f21a3c1f28b2af8b7b836e0cf37de12b3e20.

Conflicts:
	mm/uksm.c
Revert "defconfigs: Enable UKSM"

This reverts commit 42c13e079e43cf4fc9b3b49a1edfde60298cf6da.
Merge branch '3.0.31' into 3.0.31-ultra