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
msm: audio: qdsp6v2: Add size safety check to ACDB driver

Check that the size sent by userspace is not larger
then the internal amount allowed. This protects
against overflowing the stack due to an invalid size.
Change-Id: I8230fdb00a7b57d398929e8ab0eb6587476f3db1
CRs-fixed: 470222
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
Revert "merge camera jfactive sources"

merging forks branches is not a good idea

This reverts commit 981d1b772d2309f699921c875d586098ca36cbde

Change-Id: I82331cf1c7fc7979ab587ecdd3de43dda45db9f3
Merge "Revert "merge camera jfactive sources"" into cm-10.1
Revert "jfactivexx: MEx merge"

merging forks branches is not a good idea

This reverts commit 49f44213a0fa44c2a57acfecb94193d6ec594ebd

Change-Id: I95e55f43810d5164caf60e2205efe82a453e9da8
Merge remote-tracking branch 'cm/cm-10.1' into db42