oppo: drivers/video/msm/vidc

Conflicts:
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
oppo: include/linux

Conflicts:
	include/linux/nl80211.h
oppo: include/linux/i2c
oppo: include/linux/mfd/pm8xxx

Conflicts:
	include/linux/mfd/pm8xxx/ccadc.h
	include/linux/mfd/pm8xxx/pm8921-bms.h
find5: #ifdef changes