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
oppo: arm/mach-msm/include
oppo: arm/mm
oppo: drivers
oppo: drivers/char
oppo: drivers/gpu/msm
oppo: drivers/hwmon
oppo: drivers/input/touchscreen
oppo: drivers/iommu
oppo: drivers/leds
oppo: drivers/media/video/msm

Conflicts:
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_mctl.c
oppo: drivers/media/video/msm/actuators

Conflicts:
	drivers/media/video/msm/actuators/msm_actuator.c
oppo: drivers/media/video/msm/io

Conflicts:
	drivers/media/video/msm/io/msm_camera_io_util.c
oppo: drivers/media/video/msm/sensors

Conflicts:
	drivers/media/video/msm/sensors/msm_sensor.c
oppo: drivers/media/video/msm/server
oppo: drivers/media/video/msm/vfe

Conflicts:
	drivers/media/video/msm/vfe/msm_vfe32.c
oppo: drivers/mfd
oppo: drivers/misc
oppo: drivers/misc/shineled