Fix conflict in last commit
gpu overclock

Signed-off-by: flar2 <asegaert@gmail.com>

Conflicts:
	arch/arm/mach-msm/board-ville.c
	arch/arm/mach-msm/devices-8960.c