Merge.

diff --git a/ChangeLog b/ChangeLog
index 42e0c35b53eb23bf8c80a9794c934a3570653b3d..f902baf9ddbb10812b8c2958814a92ccef908ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-07  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/bits/stat.h: Undo last patch.
+
+2002-03-17  Andreas Jaeger  <aj@suse.de>
+
+        * libio/iofdopen.c (_IO_new_fdopen): Pass parameter of correct
+        type to _IO_setb.
+
 2002-03-17  Andreas Jaeger  <aj@suse.de>
 
        * sysdeps/mips/fpu/fraiseexcpt.c (__feraiseexcept): Set cause bits.
@@ -5,7 +14,7 @@
        * sysdeps/mips/fpu/fgetexcptflg.c (__fegetexceptflag): Add comment.
 
        * sysdeps/mips/fpu/fclrexcpt.c (__feclearexcept): Clear also cause
-       bits.   
+       bits.
 
        * sysdeps/mips/fpu/fenv_libc.h (CAUSE_MASK): New.
        (CAUSE_SHIFT): New.