tree 0a69ee5fb30c66083f46973eac9cb22f402fc67a
parent 72dc3aa09de307ee1c29b1313537c1e59651a6ec
parent bc9a836cc1e69e35b94235ae8de6f39d76d2272b
author Linux Build Service Account <lnxbuild@localhost> 1372844560 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1372844559 -0700

Merge "ASoC: msm: qdsp6v2: defer probe if memory allocation fails"