diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-11 13:02:45 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-11 13:02:45 -0400 |
| commit | 2df1f7be58b2dfc80d29e7d53415df48949340ce (patch) | |
| tree | 6f46f61265fd287cfb5123e4059eb5dae2d1d572 /ChangeLog | |
| parent | 14d96785125abee5e9a49a1c3037f35a581750bd (diff) | |
| parent | 6761ac045dd33da3e0e5c79b0879a0d7406b439e (diff) | |
| download | glibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.tar.gz glibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.tar.xz glibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 8ac7d9d0a5..c8bb204868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,14 @@ * dirent/scandirat64.c (SCANDIRAT): Remove underscores. * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise. +2011-08-10 David S. Miller <davem@davemloft.net> + + * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Add missing comma in + enum. + * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise. + * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise. + 2011-08-09 Ulrich Drepper <drepper@gmail.com> * Versions.def [libc]: Add GLIBC_2.15. |