iMerge some more.

1 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 33a598ff07..4bc4bb12fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-12-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/bits/errno.h: Define EOWNERDEAD
+	and ENOTRECOVERABLE if not already defined.
+	* sysdeps/unix/sysv/linux/alpha/bits/errno.h: Likewise.
+
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/alpha/Versions: Add new errlist-compat
+	entry for up to 138 errnos.
+
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* iconv/gconv_trans.c (__gconv_transliterate): Demangle step __fct
+	before calling it.
+
+2005-12-27  David S. Miller  <davem@sunset.davemloft.net>
+
+	* sysdeps/unix/sysv/linux/sparc/Versions: Add new errlist-compat
+	entry for up to 134 errnos.
+
 2005-12-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* Versions.def: Add GLIBC_2.4 for libpthread.