Merge tag '3.22.02.11' into ipc-next
authorChris Ring <cring@ti.com>
Tue, 22 Jul 2014 23:31:37 +0000 (16:31 -0700)
committerChris Ring <cring@ti.com>
Tue, 22 Jul 2014 23:31:37 +0000 (16:31 -0700)
3.22.02.11


Trivial merge