about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:57 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:57 +0000
commit5b6cc55cb5abe79a456035bd215836e48dd96a28 (patch)
tree3878e590ada32d365e2d4fce0e91e9ac10100db3
parenteb35b0972f174cd58f118737c2935653309df7e9 (diff)
downloadglibc-5b6cc55cb5abe79a456035bd215836e48dd96a28.tar.gz
glibc-5b6cc55cb5abe79a456035bd215836e48dd96a28.tar.xz
glibc-5b6cc55cb5abe79a456035bd215836e48dd96a28.zip
Update.
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9040a40af2..35097f1d79 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):