jf: MFx merge

Conflicts:
	arch/arm/mach-msm/msm_bus/msm_bus_board_8064.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c

Change-Id: I81fb72095d66511c0d4221b830f72f8b6b85ea47
upgrade to google sources

Conflicts:
	arch/arm/mach-msm/board-jf_cri.c
	arch/arm/mach-msm/board-jf_dcm.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/hotplug.c
	arch/arm/mach-msm/pm-8x60.c
	drivers/gpu/ion/msm/msm_ion.c
	drivers/input/keyboard/gpio_keys.c
	drivers/media/video/msm/sensors/jc_v4l2.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
Change-Id: Icac51ed5ab5e58e0ec1eeaf6c9d4306db6c613c3
Merge remote-tracking branch 'cm/cm-10.1' into db42

Conflicts:
	fs/ecryptfs/keystore.c