fix possible mismerge

Change-Id: I03576d58331113a903133efd41e9dccc355adb2e
jfactivexx: MEx merge

this should be good to go, only thing that need fixing drivers/media/video/msm_jfactive need compile fixes but it is disabled by default.

Conflicts:
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/hotplug.c
	arch/arm/mach-msm/pm-8x60.c
	drivers/input/keyboard/gpio_keys.c
	drivers/media/video/msm/sensors/jc_v4l2.c
	drivers/mfd/max77693.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
Change-Id: Ifc399d56cfa702a3c3ab5d539296d111d0d0dde4
merge camera jfactive sources

Change-Id: I36911342be2319340f8fe2cd46466c77aafb9fbf
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_jf into kbc-aosp-jb-mr1

Conflicts:
	fs/ecryptfs/keystore.c