Merge remote-tracking branch 'omap-mirror/p-jb-mr1-release' into HEAD
authorRoman Shaposhnikov <x0166637@ti.com>
Fri, 14 Jun 2013 16:00:57 +0000 (19:00 +0300)
committerRoman Shaposhnikov <x0166637@ti.com>
Fri, 14 Jun 2013 16:00:57 +0000 (19:00 +0300)
Conflicts:
omap5/sgx.tgz

Change-Id: Id91378eff3325f1dfa615f454f54feecbfaa28a3
Signed-off-by: Roman Shaposhnikov <x0166637@ti.com>

Trivial merge