Merge remote-tracking branch 'origin/3.36' into ipc-next
authorRobert Tivy <rtivy@ti.com>
Fri, 24 Jul 2015 20:48:41 +0000 (13:48 -0700)
committerRobert Tivy <rtivy@ti.com>
Fri, 24 Jul 2015 20:48:41 +0000 (13:48 -0700)

Trivial merge