summaryrefslogtreecommitdiff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2015-01-23 16:47:35 +0100
committerThomas Schwinge <thomas@codesourcery.com>2015-01-23 16:47:35 +0100
commita4f32dac3aa9fd9fd00dfb2dacaf039674437be0 (patch)
tree22c063ae6d7784a889621c30f5215099bbb159e6 /elf/rtld.c
parentd4e923339bd73d86f99c63b5ed00dcad0e817671 (diff)
parent58695b88a9deaecbcf7794760cc333177edaa2b4 (diff)
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts: hurd/hurdsocket.h sysdeps/mach/hurd/errno-loc.c
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 30cd6bb3dd..73ef324ca0 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
/* Run time dynamic linker.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-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