summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/sparc/leon3/ChangeLog
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-28 18:15:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-28 18:15:49 +0000
commit166247fb9d59625ca1849d020caef3f01601b437 (patch)
tree304b071767c94bb68fd3002f30022850f1e19e57 /c/src/lib/libbsp/sparc/leon3/ChangeLog
parent2007-03-28 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-166247fb9d59625ca1849d020caef3f01601b437.tar.bz2
2007-03-28 Joel Sherrill <joel@OARcorp.com>
* include/amba.h: Remove CVS conflict marker.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/ChangeLog')
-rw-r--r--c/src/lib/libbsp/sparc/leon3/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index a9925dd889..9bd3ed06b3 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-28 Joel Sherrill <joel@OARcorp.com>
+
+ * include/amba.h: Remove CVS conflict marker.
+
2007-03-11 Joel Sherrill <joel@OARcorp.com>
* startup/bspstart.c: Remove assignments of