Merge branch 'master' into edma3_keystone2
authorIvan Pang <i-pang@ti.com>
Tue, 28 Jan 2014 20:18:09 +0000 (15:18 -0500)
committerIvan Pang <i-pang@ti.com>
Tue, 28 Jan 2014 20:18:09 +0000 (15:18 -0500)

Trivial merge