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

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

(limited to 'doc')

diff --git a/doc/supplements/arm/ChangeLog b/doc/supplements/arm/ChangeLog
index 6c5c764ba5..83f8e83398 100644
--- a/doc/supplements/arm/ChangeLog
+++ b/doc/supplements/arm/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19	Joel Sherrill <joel@OARcorp.com>
+
+	* arm.texi: Merge from branch.
+
 2003-01-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* arm.texi: Set @setfilename arm.info.
diff --git a/doc/supplements/arm/arm.texi b/doc/supplements/arm/arm.texi
index 635c08601a..32c3dcab18 100644
--- a/doc/supplements/arm/arm.texi
+++ b/doc/supplements/arm/arm.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