From 2d32c4f00084f68a390e8fa4291acb49e9c0df8e Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Wed, 10 Oct 2012 15:35:46 +0000
Subject: Merge changes between r20863 and r21108 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@21109 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/ports/ChangeLog.ia64 | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libc/ports/ChangeLog.ia64')

diff --git a/libc/ports/ChangeLog.ia64 b/libc/ports/ChangeLog.ia64
index 39ec5ffe7..641033b29 100644
--- a/libc/ports/ChangeLog.ia64
+++ b/libc/ports/ChangeLog.ia64
@@ -1,3 +1,12 @@
+2012-10-09  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/ia64/configure: Regenerated.
+
+2012-10-02  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h: Fix clone
+	flag name in comment to CLONE_CHILD_CLEARTID.
+
 2012-09-24  Mike Frysinger  <vapier@gentoo.org>
 
 	* ports/sysdeps/ia64/fpu/fegetround.c (fegetround): Move contents
-- 
cgit v1.2.3