From 4936eb9abe0a4418885c11b0511f07a86a4fe178 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 25 Nov 1997 18:57:03 +0000
Subject: [PATCH] Do not complain when trying to merge private data from
 different formats.

---
 bfd/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bdc7613..8083b75 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 25 10:55:36 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Do not
+	complain if inout and output formats differ.
+
 Tue Nov 25 11:26:27 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.am (BFD32_BACKENDS): Remove tekhex.lo.
-- 
2.7.4