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

Conflicts:
	rootdir/etc/init.qcom.early_boot.sh
	rootdir/etc/init.qcom.usb.sh

'Merge'