From 17d9ce7e2917e61bb7eb6b3c868e7dcafb72f64f Mon Sep 17 00:00:00 2001
From: geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 16 Mar 2000 03:18:37 +0000
Subject: [PATCH] Add note about the merge to the mainline.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/newppc-branch@32576 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/config/rs6000/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gcc/config/rs6000/ChangeLog b/gcc/config/rs6000/ChangeLog
index 4d51b1d7263..90101321076 100644
--- a/gcc/config/rs6000/ChangeLog
+++ b/gcc/config/rs6000/ChangeLog
@@ -1,3 +1,6 @@
+This branch has now been merged into the mainline; you should add any further 
+changes there.
+
 2000-03-15  Geoff Keating  <geoffk@cygnus.com>
 
 	* rs6000.c (toc_hash_table): Update for new hash table functions.
-- 
2.11.4.GIT