Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_htc_msm8960 into cm-10.1

Conflicts:
	arch/arm/mach-msm/smd_rpc_sym
	include/trace/events/sync.h
	scripts/Lindent
	scripts/bloat-o-meter
	scripts/checkincludes.pl
	scripts/checkkconfigsymbols.sh
	scripts/checkstack.pl
	scripts/checkversion.pl
	scripts/cleanfile
	scripts/cleanpatch
	scripts/config
	scripts/decodecode
	scripts/diffconfig
	scripts/extract-ikconfig
	scripts/headerdep.pl
	scripts/headers.sh
	scripts/makelst
	scripts/mkcompile_h
	scripts/mkuboot.sh
	scripts/namespace.pl
	scripts/package/mkspec
	scripts/recordmcount.pl
	scripts/show_delta
	scripts/ver_linux