From 2307e1261e7ee784afd424a46ad08d3fbed33ba3 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue, 24 Jun 2014 22:40:07 +0530
Subject: Fix namespace violation in pthreadtypes.h (BZ #17084)

This was causing conformtest failures on i386.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e60ef7e237..aa98af8b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	[BZ #17084]
+	* sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_mutex_t):
+	Rename member __data.d to __data.__elision_data.
+
 2014-06-24  Wilco  <wdijkstr@arm.com>
 
 	* NEWS: Add 16918 to fixed bug list.
-- 
cgit v1.2.3