summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386/i386ex/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex/ChangeLog')
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 2c9c8657fd..3f50561016 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * network/network.c: Eliminate patterns that look like CVS conflict
+ markers.
+
2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/bspstart.c: Add capability for bootcard.c BSP Initialization