oppo: arm/kernel
oppo: arm/mach-msm

Conflicts:
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/devices-8064.c

Conflicts:
	arch/arm/mach-msm/board-8064-pmic.c