summaryrefslogtreecommitdiff
path: root/nptl/sysdeps/unix/sysv/linux/fork.h
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-08-30 23:23:41 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-08-30 23:23:41 +0400
commitd6177bbbd17ddd3f837485f6cb59e24fbc7f82c5 (patch)
tree009c30637db1e59410942e9f447f9e310da859e5 /nptl/sysdeps/unix/sysv/linux/fork.h
parent411498f0cc1bfe8762a4d999ac2761a70c305113 (diff)
parent344e61df0200af758e794b9843ffb37bd89e5259 (diff)
downloadglibc-d6177bbbd17ddd3f837485f6cb59e24fbc7f82c5.tar.gz
Merge branch 'release/2.19/master' of git://sourceware.org/git/glibc
Conflicts: configure.in include/features.h io/ftw.c malloc/arena.c malloc/malloc.c malloc/mtrace.c nptl/allocatestack.c nptl/nptl-init.c nptl/pthread_attr_init.c nptl/pthread_create.c nptl/pthread_detach.c nptl/pthread_getschedparam.c nptl/pthread_setschedparam.c nptl/pthread_setschedprio.c nptl/pthread_timedjoin.c nptl/pthread_tryjoin.c nptl/sysdeps/unix/sysv/linux/fork.h nptl/sysdeps/unix/sysv/linux/register-atfork.c nptl/sysdeps/unix/sysv/linux/unregister-atfork.c nptl/sysdeps/x86_64/tls.h nscd/Makefile sysdeps/unix/inet/syscalls.list sysdeps/unix/opendir.c sysdeps/x86_64/multiarch/strcasestr-nonascii.c
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/fork.h')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/fork.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.h b/nptl/sysdeps/unix/sysv/linux/fork.h
index 753460abb0..afb49b1e96 100644
--- a/nptl/sysdeps/unix/sysv/linux/fork.h
+++ b/nptl/sysdeps/unix/sysv/linux/fork.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.