battery: htc_battery update
qsd8k: copy msm-specific headers.
drivers: power: ds2784: Get rid of nasty deadlock

Conflicts:
	drivers/power/ds2784_battery.c