Merge branch '3.0.31' of https://github.com/TeamCanjica/Samsung_STE_Kernel into 3.0.31
LiveOPP: Fix missing marco code

Signed-off-by: cocafe <cocafehj@gmail.com>
Merge branch '3.0.31' into 3.0.31-ultra