Merge branch 'master' into edma3_keystone2
authorIvan Pang <i-pang@ti.com>
Fri, 6 Jun 2014 22:24:58 +0000 (18:24 -0400)
committerIvan Pang <i-pang@ti.com>
Fri, 6 Jun 2014 22:24:58 +0000 (18:24 -0400)

Trivial merge