aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Herrmann <herrmann.der.user@googlemail.com>2012-10-29 13:50:47 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-10-29 20:48:01 -0400
commitd034fbf08b6fe86271d0d0bd332edabeb5749fd6 (patch)
tree75e2df38e87e766f7075561a12075bc1a88a67e3
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
hwmon, fam15h_power: Change email address, MAINTAINERS entry
Signed-off-by: Andreas Herrmann <herrmann.der.user@googlemail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--Documentation/hwmon/fam15h_power2
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/hwmon/fam15h_power.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/hwmon/fam15h_power b/Documentation/hwmon/fam15h_power
index a92918e0bd6..80654813d04 100644
--- a/Documentation/hwmon/fam15h_power
+++ b/Documentation/hwmon/fam15h_power
@@ -10,7 +10,7 @@ Supported chips:
10 BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors 10 BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors
11 (not yet published) 11 (not yet published)
12 12
13Author: Andreas Herrmann <andreas.herrmann3@amd.com> 13Author: Andreas Herrmann <herrmann.der.user@googlemail.com>
14 14
15Description 15Description
16----------- 16-----------
diff --git a/MAINTAINERS b/MAINTAINERS
index 1fa907441f8..a4e81367a3a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -503,7 +503,7 @@ F: include/linux/altera_uart.h
503F: include/linux/altera_jtaguart.h 503F: include/linux/altera_jtaguart.h
504 504
505AMD FAM15H PROCESSOR POWER MONITORING DRIVER 505AMD FAM15H PROCESSOR POWER MONITORING DRIVER
506M: Andreas Herrmann <andreas.herrmann3@amd.com> 506M: Andreas Herrmann <herrmann.der.user@googlemail.com>
507L: lm-sensors@lm-sensors.org 507L: lm-sensors@lm-sensors.org
508S: Maintained 508S: Maintained
509F: Documentation/hwmon/fam15h_power 509F: Documentation/hwmon/fam15h_power
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 68ad7d25551..4f411040738 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -2,7 +2,7 @@
2 * fam15h_power.c - AMD Family 15h processor power monitoring 2 * fam15h_power.c - AMD Family 15h processor power monitoring
3 * 3 *
4 * Copyright (c) 2011 Advanced Micro Devices, Inc. 4 * Copyright (c) 2011 Advanced Micro Devices, Inc.
5 * Author: Andreas Herrmann <andreas.herrmann3@amd.com> 5 * Author: Andreas Herrmann <herrmann.der.user@googlemail.com>
6 * 6 *
7 * 7 *
8 * This driver is free software; you can redistribute it and/or 8 * This driver is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
28#include <asm/processor.h> 28#include <asm/processor.h>
29 29
30MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor"); 30MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
31MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>"); 31MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
32MODULE_LICENSE("GPL"); 32MODULE_LICENSE("GPL");
33 33
34/* D18F3 */ 34/* D18F3 */