Fix stale email addresses in xenstat and xentop.

Our @us.ibm.com emails cannot forward to us; we do not have access to
them when not interning at IBM.  People have attempted to reach us via
those addresses and failed; occasionally they've Googled for a current
address, which made us realize the problem.  Change each email to a
more permanent address, so people can reach us in the future.  Change
bug reporting addresses to a xen mailing list rather than an
individual.

Signed-off-by: Josh Triplett <josh@kernel.org>

8 files changed, 20 insertions, 20 deletions

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index fbfcb4dc38..ed359a6ded 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -1,6 +1,6 @@
 # libxenstat: statistics-collection library for Xen
 # Copyright (C) International Business Machines Corp., 2005
-# Author: Josh Triplett <josht@us.ibm.com>
+# Author: Josh Triplett <josh@kernel.org>
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c
index ca81a99cd9..7678aca46e 100644
--- a/tools/xenstat/libxenstat/src/xenstat.c
+++ b/tools/xenstat/libxenstat/src/xenstat.c
@@ -1,8 +1,8 @@
 /* libxenstat: statistics-collection library for Xen
  * Copyright (C) International Business Machines Corp., 2005
- * Authors: Josh Triplett <josht@us.ibm.com>
- *          Judy Fischbach <jfisch@us.ibm.com>
- *          David Hendricks <dhendrix@us.ibm.com>
+ * Authors: Josh Triplett <josh@kernel.org>
+ *          Judy Fischbach <jfisch@cs.pdx.edu>
+ *          David Hendricks <cro_marmot@comcast.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/xenstat/libxenstat/src/xenstat.h b/tools/xenstat/libxenstat/src/xenstat.h
index 0d791650b2..345a1eda14 100644
--- a/tools/xenstat/libxenstat/src/xenstat.h
+++ b/tools/xenstat/libxenstat/src/xenstat.h
@@ -1,8 +1,8 @@
 /* libxenstat: statistics-collection library for Xen
  * Copyright (C) International Business Machines Corp., 2005
- * Authors: Josh Triplett <josht@us.ibm.com>
- *          Judy Fischbach <jfisch@us.ibm.com>
- *          David Hendricks <dhendrix@us.ibm.com>
+ * Authors: Josh Triplett <josh@kernel.org>
+ *          Judy Fischbach <jfisch@cs.pdx.edu>
+ *          David Hendricks <cro_marmot@comcast.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c b/tools/xenstat/libxenstat/src/xenstat_linux.c
index 2d442fb386..db45ad5761 100644
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c
@@ -1,8 +1,8 @@
 /* libxenstat: statistics-collection library for Xen
  * Copyright (C) International Business Machines Corp., 2005
- * Authors: Josh Triplett <josht@us.ibm.com>
- *          Judy Fischbach <jfisch@us.ibm.com>
- *          David Hendricks <dhendrix@us.ibm.com>
+ * Authors: Josh Triplett <josh@kernel.org>
+ *          Judy Fischbach <jfisch@cs.pdx.edu>
+ *          David Hendricks <cro_marmot@comcast.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/xenstat/libxenstat/src/xenstat_priv.h b/tools/xenstat/libxenstat/src/xenstat_priv.h
index 980e0925bc..719edad8ff 100644
--- a/tools/xenstat/libxenstat/src/xenstat_priv.h
+++ b/tools/xenstat/libxenstat/src/xenstat_priv.h
@@ -1,8 +1,8 @@
 /* libxenstat: statistics-collection library for Xen
  * Copyright (C) International Business Machines Corp., 2005
- * Authors: Josh Triplett <josht@us.ibm.com>
- *          Judy Fischbach <jfisch@us.ibm.com>
- *          David Hendricks <dhendrix@us.ibm.com>
+ * Authors: Josh Triplett <josh@kernel.org>
+ *          Judy Fischbach <jfisch@cs.pdx.edu>
+ *          David Hendricks <cro_marmot@comcast.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 5f85d732e6..1f8b2da380 100644
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -1,5 +1,5 @@
 # Copyright (C) International Business Machines Corp., 2005
-# Author: Josh Triplett <josht@us.ibm.com>
+# Author: Josh Triplett <josh@kernel.org>
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tools/xenstat/xentop/xentop.1 b/tools/xenstat/xentop/xentop.1
index b925a3795f..78c3332895 100644
--- a/tools/xenstat/xentop/xentop.1
+++ b/tools/xenstat/xentop/xentop.1
@@ -1,5 +1,5 @@
 .\" Copyright (C) International Business Machines  Corp., 2005
-.\" Author: Josh Triplett <josht@us.ibm.com>
+.\" Author: Josh Triplett <josh@kernel.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@ scroll domain display
 Written by Judy Fischbach, David Hendricks, and Josh Triplett
 
 .SH "REPORTING BUGS"
-Report bugs to <dsteklof@us.ibm.com>.
+Report bugs to <xen-tools@lists.xensource.com>.
 
 .SH COPYRIGHT
 Copyright \(co 2005  International Business Machines  Corp
diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 2bb28205f6..5019946799 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -1,8 +1,8 @@
 /*
  *  Copyright (C) International Business Machines  Corp., 2005
- *  Author(s): Judy Fischbach <jfisch@us.ibm.com>
- *             David Hendricks <dhendrix@us.ibm.com>
- *             Josh Triplett <josht@us.ibm.com>
+ *  Author(s): Judy Fischbach <jfisch@cs.pdx.edu>
+ *             David Hendricks <cro_marmot@comcast.net>
+ *             Josh Triplett <josh@kernel.org>
  *    based on code from Anthony Liguori <aliguori@us.ibm.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 "Copyright (C) 2005  International Business Machines  Corp\n"\
 "This is free software; see the source for copying conditions.There is NO\n"\
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-#define XENTOP_BUGSTO "Report bugs to <dsteklof@us.ibm.com>.\n"
+#define XENTOP_BUGSTO "Report bugs to <xen-tools@lists.xensource.com>.\n"
 
 #define _GNU_SOURCE
 #include <getopt.h>