Merge remote-tracking branch 'origin/android-msm-hammerhead-3.4-kitkat-mr1' into exp

Conflicts:
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/thermal/msm_thermal.c

Conflicts:
	drivers/net/wireless/bcmdhd/dhd.h