Merge branch 'cm-11.0' of github.com:CyanogenMod/android_device_samsung_d2lte into cm-11.0

Conflicts:
	init/init_d2lte.c

Change-Id: Ic77ffb8707b5a0ab4da28c2d207a35227f9b9278
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_device_samsung_d2lte into cm-11.0

Conflicts:
	audio/snd_soc_msm_2x
	init/init_d2lte.c