Merging upstream version 2.40.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 20a778a..ae30566 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -241,11 +241,13 @@ CONTRIBUTORS:
       Christoph Junghans <ottxor@gentoo.org>
       Christoph Lameter <clameter@miriam.fuller.edu>
       Chris Webb <chris@arachsys.com>
+      CismonX <admin@cismon.net>
       Claus Hindsgaul <claus_h@image.dk>
       Cliff Wickman <cpw@sgi.com>
       Clytie Siddall <clytie@riverland.net.au>
       Cody Maloney <cmaloney@theoreticalchaos.com>
       Colin Gillespie <colin@cgillespie.xyz>
+      Colin Walters <walters@verbum.org>
       Colin Watson <cjwatson@canonical.com>
       Cong Wang <xiyou.wangcong@gmail.com>
       Corentin Chary <corentincj@iksaif.net>
@@ -381,6 +383,7 @@ CONTRIBUTORS:
       Gabriel M. Schuyler <schuyler@easiest.com>
       Gaël PORTAY <gael.portay@collabora.com>
       Gao Xiang <hsiangkao@redhat.com>
+      Gavin Lloyd <gavinhungry@gmail.com>
       Georg Schiesser <georg.schiesser@opentech.at>
       Georgy Yakovlev <gyakovlev@gentoo.org>
       Gerald Schaefer <gerald.schaefer@de.ibm.com>
@@ -787,6 +790,7 @@ CONTRIBUTORS:
       Rian Hunter <rian@alum.mit.edu>
       Richard Allen <rsaxvc@rsaxvc.net>
       Richard Fuchs <rfuchs@sipwise.com>
+      Richard Purdie <richard.purdie@linuxfoundation.org>
       Richard Tollerton <rich.tollerton@ni.com>
       Richard Weinberger <richard@nod.at>
       Richard W.M. Jones <rjones@redhat.com>
@@ -926,6 +930,7 @@ CONTRIBUTORS:
       Thorsten Glaser <tg@mirbsd.org>
       Thorsten Kukuk <kukuk@suse.com>
       Thorsten Wilmer <wilmer.thorsten@gmail.com>
+      Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
       Tilman Schmidt <tilman@imap.cc>
       Tim Gardner <tim.gardner@canonical.com>
       Tim Hallmann <tim@t8w.de>