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

Change-Id: Icba357bd94df49ef2ad546b72cd75dfe4f2a6081


Trivial merge