From: Petr Baudis <pasky@suse.cz>
Date: Mon, 29 Nov 2010 19:56:49 +0000 (+0100)
Subject: Remove duplicate ChangeLog entry for f906814
X-Git-Tag: glibc-2.11.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c26c0f7f9f5a953b21bd38dab97cbb9a59513af;p=thirdparty%2Fglibc.git

Remove duplicate ChangeLog entry for f906814
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 44af06a9027..73c65e65ff0 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,10 +1,3 @@
-2010-10-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	[BZ #12113]
-	* sysdeps/x86_64/pthreaddef.h (TCB_ALIGNMENT): Changed to 32.
-	* sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Defined with alignment
-	of "struct pthread".
-
 2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.