24 files changed, 22 insertions, 76 deletions
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index f50adc240d..45b4ba280a 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -2,8 +2,6 @@
 #
 # This file is part of msrtool.
 #
-# Copyright (c) 2008 Peter Stuge <peter@stuge.se>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
diff --git a/util/msrtool/configure b/util/msrtool/configure
index 0606f4b8b9..5f55056c9d 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -2,8 +2,6 @@
 #
 # This file is part of msrtool.
 #
-# Copyright (c) 2008, 2009 Peter Stuge <peter@stuge.se>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
diff --git a/util/msrtool/cs5536.c b/util/msrtool/cs5536.c
index d9c66d2c88..3d035000a3 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Peter Stuge <peter@stuge.se>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index 1423fbd74d..efa37fce79 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 84988c748b..40cd9a16d7 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Andriy Gapon <avg@icyb.net.ua>
- * Copyright (c) 2009 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index 9b6f221591..d6a845fc12 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 2009 Nils Jacobs <njacobs8@hetnet.nl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index b7e8917118..bac8ec1a82 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index 8a73d94966..ac63a2615f 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2013 Olivier Langlois <olivier@olivierlanglois.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index fdf4005cc8..fcb3a91659 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index a3c7ad26cc..ea35ac4b04 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index fda85327bd..7e1cdfd9c6 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2013 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index c5c30826f1..3f472e8f6f 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2012 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index e541e00e95..aedc4402cf 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index dbbc985b4d..676f134c41 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index 088a68ddcc..249cac8136 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index a23a99e606..0b51707d19 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium_d.c b/util/msrtool/intel_pentium_d.c
index f3675614f8..28b544bb01 100644
--- a/util/msrtool/intel_pentium_d.c
+++ b/util/msrtool/intel_pentium_d.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 16f626f55a..96aa6c5dfe 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Marc Jones <marcj303@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 64b4af212f..ccf8dbd0e0 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 540ff53961..13586d8c78 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index 8cba4c7483..f6ba66829b 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index 1c6707e4c2..82199a8f80 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 7ff1131b63..f79391d434 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/via_c7.c b/util/msrtool/via_c7.c
index 07ed1756e7..9939798151 100644
--- a/util/msrtool/via_c7.c
+++ b/util/msrtool/via_c7.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
- * Copyright (C) 2017 Lubomir Rintel <lkundrak@v3.sk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as