msm: kgsl: fix pm_qos initialization

Signed-off-by: Marc Alexander <admin@m-a-styles.de>
msm: htc_battery: use newer code from 3.0.16 primou kernel

We used to use the outdated code from the .32 kernel. Due to
changes in the usb and battery code, this will now properly
work with the QSD8x50 devices, too.

Signed-off-by: Marc Alexander <admin@m-a-styles.de>

Conflicts:
	arch/arm/mach-msm/htc_battery.c