Merge remote-tracking branch 'origin/3.40' into ipc-next
authorAngela Stegmaier <angelabaker@ti.com>
Tue, 15 Dec 2015 20:02:04 +0000 (14:02 -0600)
committerAngela Stegmaier <angelabaker@ti.com>
Tue, 15 Dec 2015 20:02:04 +0000 (14:02 -0600)

Trivial merge