merge of 2d5572f10b65f0ac7fdf54361b4dae41ebbd51d0
     and fda3a25581b7bfac581504e9e887e9b97f234f86
diff --git a/backends/ChangeLog b/backends/ChangeLog
index b5ae130..e741633 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* alpha_init.c: Initialize sysvhash_entrysize.
+	* s390_init.c: Likewise.
+
+2006-07-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* common-reloc.c (relative_reloc_p): New function.
+	(init_reloc): Hook it up.
+	* ia64_reloc.def: Define NO_RELATIVE_RELOC.
+
 2006-06-13  Roland McGrath  <roland@redhat.com>
 
 	* ppc64_retval.c: Remove SVR4_STRUCT_RETURN braino.
@@ -5,7 +16,7 @@
 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* common-reloc.c (none_reloc_p): New function.
-	(init_reloc): Hoop it up.
+	(init_reloc): Hook it up.
 
 2006-02-22  Roland McGrath  <roland@redhat.com>