From dfcace4998ceb2fb9f052bb29aabceaa40ca87f4 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 19 Sep 2003 18:02:57 +0000
Subject: 2003-09-19	Joel Sherrill <joel@OARcorp.com>

	* i960.texi: Merge from branch.
---
 doc/supplements/i960/ChangeLog | 4 ++++
 doc/supplements/i960/i960.texi | 1 +
 2 files changed, 5 insertions(+)

diff --git a/doc/supplements/i960/ChangeLog b/doc/supplements/i960/ChangeLog
index c1f56ea5a8..e3d66d046f 100644
--- a/doc/supplements/i960/ChangeLog
+++ b/doc/supplements/i960/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19	Joel Sherrill <joel@OARcorp.com>
+
+	* i960.texi: Merge from branch.
+
 2003-05-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* cpumodel.t: Reflect c/src/exec having moved to cpukit.
diff --git a/doc/supplements/i960/i960.texi b/doc/supplements/i960/i960.texi
index 630c95a41f..573964e02a 100644
--- a/doc/supplements/i960/i960.texi
+++ b/doc/supplements/i960/i960.texi
@@ -21,6 +21,7 @@
 
 @include version.texi
 @include common/setup.texi
+@include common/rtems.texi
 
 @ifset use-ascii
 @dircategory RTEMS Target Supplements
-- 
cgit v1.2.3