Merge 3.10.02.13 into ipc-next 3.20.00.04_eng
authorChris Ring <cring@ti.com>
Fri, 1 Nov 2013 00:24:47 +0000 (17:24 -0700)
committerChris Ring <cring@ti.com>
Fri, 1 Nov 2013 00:24:47 +0000 (17:24 -0700)

Trivial merge