From 0f0c35e46e9a12459a5ca64be46b6e73aa8d19d7 Mon Sep 17 00:00:00 2001
From: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Date: Wed, 22 Jan 2014 18:43:45 +0100
Subject: S/390: Merge 32 and 64 bit ucontext.h.

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a8e289ebb7..2730a81940 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-22  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: Merge into
+	s390/sys/ucontext.h.
+	* sysdeps/unix/sysv/linux/s390/s390-64/sys/ucontext.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/sys/ucontext.h: New file.
+
 2014-01-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #15605]
-- 
cgit v1.2.3-70-g09d2