Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_samsung_msm8960-common into jellybean2

Conflicts:
	BoardConfigCommon.mk
	msm8960.mk
	rootdir/etc/init.qcom.mdm_links.sh
	rootdir/etc/init.qcom.modem_links.sh

'Merge'