Merge remote-tracking branch 'aosp/android-msm-hammerhead-3.4-kitkat-mr2' into exp

Conflicts:
	arch/arm/mach-msm/sensors_adsp.c
	drivers/thermal/msm_thermal.c
	drivers/usb/gadget/f_qdss.c
	net/bluetooth/hci_conn.c
Revert changes I1e2e5c, Icbc579, Ibd6f34

This reverts the following commits:
4b2370387c850cc4439a4b663f45e267626eeb45
434df88d04d2b945788a18251e3377811e205e35
bea1c921e6c1e2666c96e4027eb31786ee8867c3

Change-Id: Ieb3af189e28b205c8ab6d40b53073b1b9c4c89e6
msm: kgsl: Revert driver back to 47c64903b6ec10310ea2cefa00dee57272f8896e

Change-Id: I1f3fb5f3d61db6371a647c7b47a433a29779918f
Signed-off-by: Rob Beane <robbeane@gmail.com>
Merge branch 'exp' of https://github.com/showp1984/bricked-hammerhead into kk_mr2-staging