From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 11 Aug 2011 17:02:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~414
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2df1f7be58b2dfc80d29e7d53415df48949340ce;p=glibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
---

2df1f7be58b2dfc80d29e7d53415df48949340ce
diff --cc ChangeLog
index 8ac7d9d0a5,6af37e081d..c8bb204868
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
 +2011-08-10  Andreas Schwab  <schwab@redhat.com>
 +
 +	* include/dirent.h: Add libc_hidden_proto for scandirat and
 +	scandirat64.  Don't declare __scandirat64.
 +	* dirent/scandirat.c: Add libc_hidden_def.
 +	* 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.