Merge remote-tracking branch 'origin/3.22' into ipc-next
authorChris Ring <cring@ti.com>
Fri, 11 Jul 2014 05:19:11 +0000 (22:19 -0700)
committerChris Ring <cring@ti.com>
Fri, 11 Jul 2014 05:19:11 +0000 (22:19 -0700)

Trivial merge