From: Linux Build Service Account <lnxbuild@localhost>
Date: Mon, 12 Sep 2016 12:16:04 +0000 (-0700)
Subject: Merge "ASoc: msm: qdsp6v2: Fix timestamp glitch during gapless transition"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bc7a35be18e39658004dcab0f780afeb45d1133d;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge "ASoc: msm: qdsp6v2: Fix timestamp glitch during gapless transition"
---

bc7a35be18e39658004dcab0f780afeb45d1133d
diff --cc sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
index 7e0f790b30e9,d96f9783668e..70ed8dd3e038
mode 100644,100755..100644
--- a/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c