From be04451f730e5c7f74e8dacba78487417933ce0a Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Sat, 28 Nov 2015 23:25:48 +0000
Subject: [PATCH] Add to correct changelog

From-SVN: r231039
---
 ChangeLog     | 9 +--------
 gcc/ChangeLog | 7 +++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c38bd55994..84ca02bfb6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2015-11-28  Nathan Sidwell  <nathan@acm.org>
-
-	* config/nvptx/nvptx.h (FIRST_PARM_OFFSET): Add void cast.
-	(FRAME_POINTER_CFA_OFFSET): Define.
-	(struct nvptx_args): Use 'tree' type.
-	(INIT_CUMULATIVE_ARGS): Remove unnecessary do...while.
-
 2015-11-26  David Edelsohn  <dje.gcc@gmail.com>
 
 	* m4/libtool.m4 (export_symbols_cmds) [AIX]: Add global TLS "L"
@@ -371,7 +364,7 @@
 	* configure: Regenerate.
 
 2015-02-06  Diego Novillo  <dnovillo@google.com>
-
+1
 	* MAINTAINERS (Global Reviewers, Plugin, LTO, tree-ssa,
 	middle-end, docstring): Remove myself.
 	(Write After Approval): Add myself.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15cb1efd575..fdfda45e875 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-28  Nathan Sidwell  <nathan@acm.org>
+
+	* config/nvptx/nvptx.h (FIRST_PARM_OFFSET): Add void cast.
+	(FRAME_POINTER_CFA_OFFSET): Define.
+	(struct nvptx_args): Use 'tree' type.
+	(INIT_CUMULATIVE_ARGS): Remove unnecessary do...while.
+
 2015-11-28  Tom de Vries  <tom@codesourcery.com>
 
 	* lto-wrapper.c (run_gcc): Handle -flinker-output argument.