From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 6 Sep 2003 09:56:57 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~252
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b6cc55cb5abe79a456035bd215836e48dd96a28;p=thirdparty%2Fglibc.git

Update.
---

diff --git a/ChangeLog b/ChangeLog
index 9040a40af26..35097f1d79c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,7 +37,6 @@
 	* sysdeps/mach/hurd/mmap.c (__mmap): If io_map fails with MIG_BAD_ID,
 	EOPNOTSUPP, or ENOSYS, change it to ENODEV.
 
->>>>>>> 1.7905
 2003-09-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/sigstack.h (MINSIGSTKSZ):