clock changes and stuffs

Conflicts:
	arch/arm/mach-msm/acpuclock-8960.c