Removed failed merge info
	modified:   Makefile
	modified:   arch/arm/mach-msm/memory.c
	modified:   build_kernel.sh
	modified:   drivers/cpufreq/cpufreq.c