Merge "msm: ipa: Neutrino IPA offload support"

diff --cc drivers/platform/msm/ipa/ipa_api.c
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_api.h
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_v2/ipa_i.h
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_v3/ipa.c
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_v3/ipa_i.h
Simple merge

diff --cc drivers/platform/msm/ipa/ipa_v3/ipa_utils.c
Simple merge