Merge d-jb-release into d-jb-mr0-release
authorKeith Deacon <kdeacon@ti.com>
Wed, 7 Nov 2012 20:50:19 +0000 (14:50 -0600)
committerKeith Deacon <kdeacon@ti.com>
Wed, 7 Nov 2012 20:50:19 +0000 (14:50 -0600)
Conflicts:
omap4/tesla_dsp.tgz

Change-Id: I90e46da6f9f2d4e50b4d8fd7c91ec512e00a9777


Trivial merge