Merge "msm: hotplug: wait for hotplug completion event from secondary core"
Signed-off-by: task650 <task650@gmail.com>

Conflicts:
	arch/arm/mach-msm/pm-8x60.c