Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18

arch/arm64/configs/marlin_defconfig

drivers/crypto/msm/qce50.c

drivers/crypto/msm/qcedev.c

drivers/misc/qcom/qdsp6v2/audio_hwacc_effects.c

drivers/platform/msm/avtimer.c

drivers/platform/msm/ipa/ipa_v2/ipa_flt.c

drivers/platform/msm/ipa/ipa_v2/ipa_nat.c

drivers/platform/msm/ipa/ipa_v2/ipa_rt.c

drivers/platform/msm/ipa/ipa_v3/ipa_nat.c

drivers/platform/msm/seemp_core/seemp_event_encoder.c

drivers/platform/msm/spmi/spmi-dbgfs.c

drivers/power/qpnp-smbcharger.c

drivers/soc/qcom/Kconfig

drivers/soc/qcom/kryo-l2-accessors.c

drivers/staging/android/ion/ion.c

drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c

...staging/qcacld-2.0/CORE/SERVICES/COMMON/wmi_unified_api.h

drivers/staging/qcacld-2.0/CORE/SERVICES/HIF/ath_procfs.c

drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c

drivers/staging/qcacld-2.0/CORE/SERVICES/WMI/wmi_unified.c