summaryrefslogtreecommitdiff
path: root/libc/ports/sysdeps/arm/nptl
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2014-01-03 17:51:28 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2014-01-03 17:51:28 +0000
commitf71e9a28759c1f5d6e8dc0baced440e72507b433 (patch)
treed1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/ports/sysdeps/arm/nptl
parent036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff)
downloadeglibc2-f71e9a28759c1f5d6e8dc0baced440e72507b433.tar.gz
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/ports/sysdeps/arm/nptl')
-rw-r--r--libc/ports/sysdeps/arm/nptl/Makefile2
-rw-r--r--libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c2
-rw-r--r--libc/ports/sysdeps/arm/nptl/pthreaddef.h2
-rw-r--r--libc/ports/sysdeps/arm/nptl/tls.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/libc/ports/sysdeps/arm/nptl/Makefile b/libc/ports/sysdeps/arm/nptl/Makefile
index fa32936c5..143850e6c 100644
--- a/libc/ports/sysdeps/arm/nptl/Makefile
+++ b/libc/ports/sysdeps/arm/nptl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
#
# The GNU C Library is free software; you can redistribute it and/or
diff --git a/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c b/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c
index bebea5ee7..7105c7359 100644
--- a/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c
+++ b/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/libc/ports/sysdeps/arm/nptl/pthreaddef.h b/libc/ports/sysdeps/arm/nptl/pthreaddef.h
index 9232fb167..2488af982 100644
--- a/libc/ports/sysdeps/arm/nptl/pthreaddef.h
+++ b/libc/ports/sysdeps/arm/nptl/pthreaddef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/libc/ports/sysdeps/arm/nptl/tls.h b/libc/ports/sysdeps/arm/nptl/tls.h
index da1502716..8cc0a6217 100644
--- a/libc/ports/sysdeps/arm/nptl/tls.h
+++ b/libc/ports/sysdeps/arm/nptl/tls.h
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/ARM version.
- Copyright (C) 2005-2013 Free Software Foundation, Inc.
+ Copyright (C) 2005-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or