diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
commit | c3bb673e376492360c895e3f70f49cbbdb48bbaf (patch) | |
tree | 06995c131eac1424dd02fe383dba2d4293d653cf /ports/sysdeps/m68k/nptl/tls.h | |
parent | d7e5ff94db82853ff8e29017e535132bfc45b2c9 (diff) | |
parent | 74509f87ae6e2ee8b87dec41c4e2d45fe2fae88f (diff) |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Conflicts:
sysdeps/mach/hurd/bits/libc-tsd.h
Diffstat (limited to 'ports/sysdeps/m68k/nptl/tls.h')
-rw-r--r-- | ports/sysdeps/m68k/nptl/tls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/sysdeps/m68k/nptl/tls.h b/ports/sysdeps/m68k/nptl/tls.h index 39f5eb068b..5de079b9d4 100644 --- a/ports/sysdeps/m68k/nptl/tls.h +++ b/ports/sysdeps/m68k/nptl/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. NPTL/m68k version. - Copyright (C) 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010. |