Merge remote-tracking branch 'origin/ipc-3.40-next' into ipc-next
authorAngela Stegmaier <angelabaker@ti.com>
Mon, 5 Oct 2015 18:07:14 +0000 (13:07 -0500)
committerAngela Stegmaier <angelabaker@ti.com>
Mon, 5 Oct 2015 18:07:14 +0000 (13:07 -0500)

Trivial merge