FIX: compilation code fixups (gcc4.6 -o2)

Conflicts:

	arch/arm/mach-msm/scm-io.c
	arch/arm/mach-msm/scm.c
	drivers/cpufreq/cpufreq.c
	drivers/net/wireless/bcm4329_248/linux_osl.c
	drivers/net/wireless/bcm4329_248/wl_iw.c

Conflicts:
	arch/arm/mach-msm/clock-debug.c
	arch/arm/mach-msm/devices_htc.c
	arch/arm/mach-msm/htc_battery_core.c
	arch/arm/mach-msm/htc_extdiag.c
	arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
	drivers/mfd/timpani-codec.c
	drivers/net/wireless/bcm4329_248/linux_osl.c
	drivers/regulator/core.c
	drivers/usb/gadget/msm72k_udc_exp.c
	net/ipv6/xfrm6_tunnel.c
	net/netfilter/nf_conntrack_proto.c