Merge remote-tracking branch 'origin/3.23' into ipc-3.30-next
authorRobert Tivy <rtivy@ti.com>
Fri, 12 Dec 2014 00:34:32 +0000 (16:34 -0800)
committerRobert Tivy <rtivy@ti.com>
Fri, 12 Dec 2014 00:34:32 +0000 (16:34 -0800)

Trivial merge