여러가지

Conflicts:

	arch/arm/mach-msm/acpuclock-8064.c