Merge branch 'ipc-3.23-next' into ipc-next 3.30.00.04_eng 3.30.00.05_eng
authorRobert Tivy <rtivy@ti.com>
Wed, 20 Aug 2014 18:16:56 +0000 (11:16 -0700)
committerRobert Tivy <rtivy@ti.com>
Wed, 20 Aug 2014 18:16:56 +0000 (11:16 -0700)

Trivial merge