Fixup ChangeLog and add missing NEWS entry for previous commits.

diff --git a/ChangeLog b/ChangeLog
index 5fa3a817d96392bcaf24f20afbf21e989ce90c68..98c952cc4d1d681be5c5276a0ba7c15ada118acc 100644 (file)
--- 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 38d2c50ce98fd93122c1a6b48ab286522f135253..0f9d6a6db35773046d5d60606a28a31c39542784 100644 (file)
--- 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.