Fixes

Signed-off-by: Paul Keith <javelinanddart@gmail.com>
Merge branch 'lptesting' of github.com:javelinanddart/android_kernel_aosp_ville into lptesting

Signed-off-by: Paul Keith <javelinanddart@gmail.com>

Conflicts:
	arch/arm/mach-msm/hotplug.c