summaryrefslogtreecommitdiff
path: root/libc/ports/ChangeLog.am33
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-03-18 16:44:23 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2013-03-18 16:44:23 +0000
commit8751114637bcc3caaf16a4216da0afb84456558a (patch)
treef3eca66b88003bc49c309a95827d461ae5b66aed /libc/ports/ChangeLog.am33
parentb261131fe2b94b53fe4950d9265ae10bef228455 (diff)
downloadeglibc2-8751114637bcc3caaf16a4216da0afb84456558a.tar.gz
Merge changes between r22552 and r22663 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22664 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/ports/ChangeLog.am33')
-rw-r--r--libc/ports/ChangeLog.am335
1 files changed, 5 insertions, 0 deletions
diff --git a/libc/ports/ChangeLog.am33 b/libc/ports/ChangeLog.am33
index 2bb7893f9..42548b2c2 100644
--- a/libc/ports/ChangeLog.am33
+++ b/libc/ports/ChangeLog.am33
@@ -1,3 +1,8 @@
+2013-03-11 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/am33/bits/mman.h: Remove all defines
+ provided by bits/mman-linux.h and include <bits/mman-linux.h>.
+
2013-02-28 Joseph Myers <joseph@codesourcery.com>
* sysdeps/am33/elf/start.S: Don't include "bp-sym.h".