Merge remote-tracking branch 'remotes/origin/dev_pasdk_qin_pasdk111_fix' into dev_pas...
authorFrank Livingston <frank-livingston@ti.com>
Thu, 10 Nov 2016 00:48:13 +0000 (18:48 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 10 Nov 2016 00:48:13 +0000 (18:48 -0600)
commit2cfca25f04575b8ad5cceedd0ecd0611626c272e
tree5bc26bec18e987057e25f2ac311ecdadec9758bf
parent58ea5ecbaa12aef0cb96ea3abaccc44a9b35b769
parent2cc7cd074bfd81cc796ed8227f5f4b8c4c3be4d4
Merge remote-tracking branch 'remotes/origin/dev_pasdk_qin_pasdk111_fix' into dev_pasdk_frank

# Conflicts:
# pasdk/test_dsp/framework/itopo/patchs.c