Modify OC Code
Merge branch 'franco-caf' of https://github.com/k5t4j5/android_kernel_htc_msm8974 into franco-caf

Conflicts:
	arch/arm/boot/dts/msm8974pro.dtsi