Merge 10
arch/arm/mach-msm/peripheral-reset-8960.c
arch/arm/mach-msm/peripheral-reset.c

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