Merge branch 'caf-exp' of https://github.com/UltimatumKang/android_kernel_htc_msm8960-3.4 into cm-10.1-dev

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>

Conflicts:
	Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
	scripts/extract-vmlinux
	scripts/kconfig/merge_config.sh
boosted7 b1

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>
Thalamus ARM Generic Hotplug: let's kill the spamlog

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>