Revert "fix build issues"

This reverts commit 7c4f0a900e6bafb27a9e09b6361f9f91953fe2b9.
Revert "Merge with ML2 kernel source"

This reverts commit 6c47acad5cd55ae008d5d0f35c6403b84d17ecf1.

Conflicts:
	arch/arm/configs/msm8930_baffinvetd_defconfig
	arch/arm/configs/msm8930_biscotto_defconfig
	arch/arm/configs/msm8930_biscotto_eng_defconfig
	arch/arm/configs/msm8930_cane_defconfig
	arch/arm/configs/msm8930_crater_00_defconfig
	arch/arm/configs/msm8930_cratertd_defconfig
	arch/arm/configs/msm8930_express2_defconfig
	arch/arm/configs/msm8930_express_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_defconfig
	arch/arm/configs/msm8930_golden_eng_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_higgs_defconfig
	arch/arm/configs/msm8930_higgs_eng_defconfig
	arch/arm/configs/msm8930_jasper2_defconfig
	arch/arm/configs/msm8930_jasper2_eng_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_rev02_defconfig
	arch/arm/configs/msm8930_ks02_defconfig
	arch/arm/configs/msm8930_ks02_skt_defconfig
	arch/arm/configs/msm8930_lt02-chn_defconfig
	arch/arm/configs/msm8930_lt02_att_defconfig
	arch/arm/configs/msm8930_lt02_chnctc_defconfig
	arch/arm/configs/msm8930_lt02_defconfig
	arch/arm/configs/msm8930_lt02_eng_defconfig
	arch/arm/configs/msm8930_lt02_spr_defconfig
	arch/arm/configs/msm8930_melius_00_defconfig
	arch/arm/configs/msm8930_melius_att_defconfig
	arch/arm/configs/msm8930_melius_chncmcc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnctc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnopen_3g_defconfig
	arch/arm/configs/msm8930_melius_eng_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
	arch/arm/configs/msm8930_melius_spr_defconfig
	arch/arm/configs/msm8930_melius_tmo_defconfig
	arch/arm/configs/msm8930_melius_usc_defconfig
	arch/arm/configs/msm8930_melius_vzw_defconfig
	arch/arm/configs/msm8930_melius_zh_lte_defconfig
	arch/arm/configs/msm8930_serrano_att_defconfig
	arch/arm/configs/msm8930_serrano_defconfig
	arch/arm/configs/msm8930_serrano_eng_defconfig
	arch/arm/configs/msm8930_serrano_spr_defconfig
	arch/arm/configs/msm8930_serrano_tmo_defconfig
	arch/arm/configs/msm8930_serrano_usa_defconfig
	arch/arm/configs/msm8930_serrano_usc_defconfig
	arch/arm/configs/msm8930_serrano_vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
Revert "samsung: msm8930: Fix reservation logic for ADSP heap"

This reverts commit 8839e0e608b66a84725c23c1a82cc6f571d078a8.
Revert "msm: Fix reservation logic for ADSP heap"

This reverts commit 1ccb05c5103e25678b519e6b8d1148259ec4f3c0.