Merge 17 - Fix errors
#modified:   arch/arm/mach-msm/include/mach/msm_memtypes.h
#modified:   arch/arm/mach-msm/restart.c

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