Fix unmerged parts
SEC_KERNEL_REBASE_FOR_PMEM_OPTIMIZATION
#modified:   arch/arm/mach-msm/memory.c
#modified:   drivers/gpu/ion/msm/msm_ion.c

Signed-off-by: cholokei <leesl0416@naver.com>