Merge tag 'AU_LINUX_ANDROID_JB_2.6.04.03.00.109.111' into cm-10.2-dev

AU_LINUX_ANDROID_JB_2.6.04.03.00.109.111 based on quic/aosp/jb_2.6

Conflicts:
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/cpp/msm_cpp.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/msm_fb.c

Change-Id: I1669e03f336163cfdc02d077b4f554352801ae6d
msm:pm: Fix for race condition of starting cpu1 when cpu0 in PC.

There is a window where core sends ipi to secondary core and
wait for it to come online for 1 second. This would allow
core0 to go power collapse in a rare condition where core1
started booting and doesn't become online yet.

Fix this by not allowing power collapse on core0
if hot plug operation is in progress.

CRs-fixed: 545714.
Change-Id: I1ca503a2f09cd9a65c2fdcd41eb54466a1e486c5
Signed-off-by: Anil kumar mamidala <amami@codeaurora.org>