summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Shaposhnikov2013-06-14 11:00:57 -0500
committerRoman Shaposhnikov2013-06-14 11:00:57 -0500
commit6c58e520dc17fb08fa66b4e116f9c822c57e1bb3 (patch)
tree502f2ffc8d63dc6615b201c6664236d120eac5be
parentbfe5d5481220e687e445c9ca27d08fec1ea5eccd (diff)
parentbffc810623a565214d5e30086f0f5e24c7c9474b (diff)
downloaddevice-ti-proprietary-open-6c58e520dc17fb08fa66b4e116f9c822c57e1bb3.tar.gz
device-ti-proprietary-open-6c58e520dc17fb08fa66b4e116f9c822c57e1bb3.tar.xz
device-ti-proprietary-open-6c58e520dc17fb08fa66b4e116f9c822c57e1bb3.zip
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>
-rw-r--r--omap5/sgx.tgzbin2526113 -> 2525142 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/omap5/sgx.tgz b/omap5/sgx.tgz
index 19a85ce..1d91ef9 100644
--- a/omap5/sgx.tgz
+++ b/omap5/sgx.tgz
Binary files differ