Conflicts:
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/fastchg.c
	include/linux/fastchg.h
Fixes

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

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