summary refs log tree commit diff
path: root/elf/tst-stackguard1.c
diff options
context:
space:
mode:
authorAndreas Schwab <aschwab@redhat.com>2009-06-10 14:04:22 +0200
committerAndreas Schwab <aschwab@redhat.com>2009-06-10 14:04:22 +0200
commit0d02cb10e8dd8639b86450cf8e597cf5e2e09894 (patch)
tree0f2174db43a501b946f0600d1b91ae4117977b04 /elf/tst-stackguard1.c
parentdfbbe67270efa9c03f9444d50d2f98a7a64622b4 (diff)
parent88ea382fda5af7717f85bb19837c9c99094f3df4 (diff)
downloadglibc-0d02cb10e8dd8639b86450cf8e597cf5e2e09894.tar.gz
glibc-0d02cb10e8dd8639b86450cf8e597cf5e2e09894.tar.xz
glibc-0d02cb10e8dd8639b86450cf8e597cf5e2e09894.zip
Merge commit 'origin/master' into fedora/master
Conflicts:
	ChangeLog
	sysdeps/unix/sysv/linux/i386/sysconf.c
	sysdeps/x86_64/cacheinfo.c
	version.h
Diffstat (limited to 'elf/tst-stackguard1.c')
0 files changed, 0 insertions, 0 deletions