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)
commit6c58e520dc17fb08fa66b4e116f9c822c57e1bb3
tree502f2ffc8d63dc6615b201c6664236d120eac5be
parentbfe5d5481220e687e445c9ca27d08fec1ea5eccd
parentbffc810623a565214d5e30086f0f5e24c7c9474b
Merge remote-tracking branch 'omap-mirror/p-jb-mr1-release' into HEAD

Conflicts:
omap5/sgx.tgz

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