From: David S. Miller <davem@davemloft.net>
Date: Tue, 3 Jun 2014 23:14:06 +0000 (-0700)
Subject: Fixup ChangeLog and add missing NEWS entry for previous commits.
X-Git-Tag: glibc-2.20~383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=902b71f9af1c01b4a118347e377b11487452b657;p=thirdparty%2Fglibc.git

Fixup ChangeLog and add missing NEWS entry for previous commits.
---

diff --git a/ChangeLog b/ChangeLog
index 5fa3a817d96..98c952cc4d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
 	(pthread_spin_lock): Likewise.
 
+	* nptl/tst-spin4.c: New test.
+	* nptl/Makefile (tests): Add tst-spin4.
+
 2014-06-03  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #15946]
@@ -136,9 +139,6 @@
 
 	* malloc/malloc.c (malloc_info): Inline mi_arena.
 
-	* nptl/tst-spin4.c: New test.
-	* nptl/Makefile (tests): Add tst-spin4.
-
 2014-05-29  Richard Henderson  <rth@twiddle.net>
 
 	* sysdeps/unix/sysv/linux/aarch64/sysdep.h (INTERNAL_VSYSCALL_NCS):
diff --git a/NEWS b/NEWS
index 38d2c50ce98..0f9d6a6db35 100644
--- a/NEWS
+++ b/NEWS
@@ -17,9 +17,9 @@ Version 2.20
   16706, 16707, 16712, 16713, 16714, 16724, 16731, 16739, 16740, 16743,
   16754, 16758, 16759, 16760, 16770, 16786, 16789, 16791, 16796, 16799,
   16800, 16815, 16823, 16824, 16831, 16838, 16849, 16854, 16876, 16877,
-  16878, 16885, 16888, 16890, 16912, 16915, 16916, 16917, 16922, 16927,
-  16928, 16932, 16943, 16958, 16966, 16967, 16965, 16977, 16978, 16984,
-  16990, 17009.
+  16878, 16882, 16885, 16888, 16890, 16912, 16915, 16916, 16917, 16922,
+  16927, 16928, 16932, 16943, 16958, 16966, 16967, 16965, 16977, 16978,
+  16984, 16990, 17009.
 
 * The minimum Linux kernel version that this version of the GNU C Library
   can be used with is 2.6.32.