Total Reboot
Merge branch 'cm-10.1' of https://github.com/mcgi5sr2/android_device_htc_msm7x30-common into cm-10.1

Conflicts:
	BoardConfigCommon.mk
	README
	audio_policy.conf
	firmware/vidc_720p_command_control.fw
	firmware/vidc_720p_h263_dec_mc.fw
	firmware/vidc_720p_h264_dec_mc.fw
	firmware/vidc_720p_h264_enc_mc.fw
	firmware/vidc_720p_mp4_dec_mc.fw
	firmware/vidc_720p_mp4_enc_mc.fw
	firmware/vidc_720p_vc1_dec_mc.fw
	include/linux/msm_ion.h
	include/linux/msm_kgsl.h
	include/linux/msm_mdp.h
	include/linux/msm_vidc_dec.h
	include/linux/msm_vidc_enc.h
	init.htc7x30.usb.rc
	msm7x30.mk