fixing OC for GPU

Conflicts:
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8960.c
	drivers/input/keyboard/gpio_keys.c
	drivers/power/pm8xxx-ccadc.c
	net/netfilter/xt_socket.c