From: Carl Love <carll@gcc.gnu.org>
Date: Thu, 6 Jul 2017 14:34:41 +0000 (+0000)
Subject: ChangeLog: Clean up from mid air collision
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d87f00baa2444a85a43c3a532eba40b3b3fa4918;p=gcc.git

ChangeLog: Clean up from mid air collision


gcc/ChangeLog:

2017-07-06  Carl Love  <cel@us.ibm.com>

 	* ChangeLog: Clean up from mid air collision

gcc/testsuite/ChangeLog:

2017-07-06  Carl Love  <cel@us.ibm.com>

 	* ChangeLog: Clean up from mid air collision

From-SVN: r250024
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ac4c1cc05a..647ca92b706 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-06  Carl Love  <cel@us.ibm.com>
+
+ 	* ChangeLog: Clean up from mid air collision
+
 2017-07-06  Carl Love  <cel@us.ibm.com>
 
 	* config/rs6000/rs6000-c.c: Add support for built-in functions
@@ -51,7 +55,6 @@
 	(linemap_client_expand_location_to_spelling_point): Add "aspect"
 	param, and pass it to expand_location_1.
 
->>>>>>> .r250022
 2017-07-06  Sebastian Peryt  <sebastian.peryt@intel.com>
 
 	* config/i386/avx512fintrin.h (_mm_mask_getexp_round_ss,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 46992f44b29..54e7bd231ef 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,6 @@
+2017-07-06  Carl Love  <cel@us.ibm.com>
+
+ 	* ChangeLog: Clean up from mid air collision
 
 2017-07-06  Carl Love  <cel@us.ibm.com>
 
@@ -27,7 +30,6 @@
 	* gcc.dg/spellcheck-fields-2.c (test_macro): Update expected
 	underlining within macro expansion.
 
->>>>>>> .r250022
 2017-07-06  Sebastian Peryt  <sebastian.peryt@intel.com>
 
 	* gcc.target/i386/avx512f-vgetexpsd-1.c (_mm_mask_getexp_sd,