1 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 019913e27d3..aa93dc4079b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-10-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Merge from gnulib, incorporating:
+        2012-10-02 pselect: reject invalid file descriptors
+        2012-10-02 ptsname: reject invalid file descriptors
+        2012-10-02 manywarnings: cater to more gcc infelicities
+        2012-09-30 sockets, sys_stat: restore AC_C_INLINE
+        * lib/pselect.c, lib/stdlib.in.h, m4/manywarnings.m4, m4/pselect.m4:
+        * m4/stdlib_h.m4, m4/sys_stat_h.m4: Update from gnulib.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
         Port timers to OpenBSD, plus check for timer failures.
         OpenBSD problem reported by Han Boetes.
         * profiler.c (setup_cpu_timer): Check for failure of timer_settime