Merge changes between r22062 and r22176 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@22177 7b3dc134-2b1b-0410-93df-9e9f96275f8d

12 files changed, 12 insertions, 13 deletions

diff --git a/libc/sysdeps/pthread/aio_cancel.c b/libc/sysdeps/pthread/aio_cancel.c
index e405e66cd..86fbcf6e8 100644
--- a/libc/sysdeps/pthread/aio_cancel.c
+++ b/libc/sysdeps/pthread/aio_cancel.c
@@ -1,5 +1,5 @@
 /* Cancel requests associated with given file descriptor.
-   Copyright (C) 1997, 1998, 2000, 2002, 2005, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_fsync.c b/libc/sysdeps/pthread/aio_fsync.c
index 5b5d1863e..79b3583bd 100644
--- a/libc/sysdeps/pthread/aio_fsync.c
+++ b/libc/sysdeps/pthread/aio_fsync.c
@@ -1,5 +1,5 @@
 /* Synchronize I/O in given file descriptor.
-   Copyright (C) 1997, 1999, 2002, 2005, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_misc.c b/libc/sysdeps/pthread/aio_misc.c
index d5bb95bd4..79153c8b7 100644
--- a/libc/sysdeps/pthread/aio_misc.c
+++ b/libc/sysdeps/pthread/aio_misc.c
@@ -1,5 +1,5 @@
 /* Handle general operations.
-   Copyright (C) 1997-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_misc.h b/libc/sysdeps/pthread/aio_misc.h
index a43cfeaab..cea1a08be 100644
--- a/libc/sysdeps/pthread/aio_misc.h
+++ b/libc/sysdeps/pthread/aio_misc.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1999,2000,2001,2003,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2013 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/sysdeps/pthread/aio_notify.c b/libc/sysdeps/pthread/aio_notify.c
index a9f0648c2..f3953f182 100644
--- a/libc/sysdeps/pthread/aio_notify.c
+++ b/libc/sysdeps/pthread/aio_notify.c
@@ -1,5 +1,5 @@
 /* Notify initiator of AIO request.
-   Copyright (C) 1997-2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_read.c b/libc/sysdeps/pthread/aio_read.c
index d02eb7b85..ac4b3b9dd 100644
--- a/libc/sysdeps/pthread/aio_read.c
+++ b/libc/sysdeps/pthread/aio_read.c
@@ -1,5 +1,5 @@
 /* Asynchronous read.
-   Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_read64.c b/libc/sysdeps/pthread/aio_read64.c
index 2fcf39fb9..8df4e1aae 100644
--- a/libc/sysdeps/pthread/aio_read64.c
+++ b/libc/sysdeps/pthread/aio_read64.c
@@ -1,5 +1,5 @@
 /* Asynchronous read, 64bit offset version.
-   Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_suspend.c b/libc/sysdeps/pthread/aio_suspend.c
index 9d3c8f996..137c97363 100644
--- a/libc/sysdeps/pthread/aio_suspend.c
+++ b/libc/sysdeps/pthread/aio_suspend.c
@@ -1,5 +1,5 @@
 /* Suspend until termination of a requests.
-   Copyright (C) 1997-2000,2002,2003,2005,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_write.c b/libc/sysdeps/pthread/aio_write.c
index 823e365c8..eac411197 100644
--- a/libc/sysdeps/pthread/aio_write.c
+++ b/libc/sysdeps/pthread/aio_write.c
@@ -1,5 +1,5 @@
 /* Asynchronous write.
-   Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/aio_write64.c b/libc/sysdeps/pthread/aio_write64.c
index 0cec64d29..e02148591 100644
--- a/libc/sysdeps/pthread/aio_write64.c
+++ b/libc/sysdeps/pthread/aio_write64.c
@@ -1,5 +1,5 @@
 /* Asynchronous write, 64bit offset version.
-   Copyright (C) 1997, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/lio_listio.c b/libc/sysdeps/pthread/lio_listio.c
index 62fe2c8f4..a4495192a 100644
--- a/libc/sysdeps/pthread/lio_listio.c
+++ b/libc/sysdeps/pthread/lio_listio.c
@@ -1,6 +1,5 @@
 /* Enqueue and list of read or write requests.
-   Copyright (C) 1997,1998,1999,2000,2001,2003,2005,2006
-	Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
diff --git a/libc/sysdeps/pthread/lio_listio64.c b/libc/sysdeps/pthread/lio_listio64.c
index 4832d339f..155cda092 100644
--- a/libc/sysdeps/pthread/lio_listio64.c
+++ b/libc/sysdeps/pthread/lio_listio64.c
@@ -1,5 +1,5 @@
 /* Enqueue and list of read or write requests, 64bit offset version.
-   Copyright (C) 1997,1998,1999,2003,2005,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.