summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Rui <ray.huang@amd.com>2015-12-10 11:56:11 +0800
committerGuenter Roeck <linux@roeck-us.net>2015-12-18 08:20:59 -0800
commit96818b5842fe8fc38aec74abcb3f8eb4da439bc7 (patch)
tree17b9a535e0551d6fdfa2929b4810a2338cfd2e4b
parenteff2a94598ee0c0c7f293a1d3d1999a5e887797a (diff)
MAINTAINERS: change the maintainer of fam15h_power driver
Andreas Herrmann won't take the maintainer of fam15h_power driver. I will take it and appreciate him for the great contributions on this driver. Signed-off-by: Huang Rui <ray.huang@amd.com> Acked-by: Andreas Herrmann <herrmann.der.user@googlemail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> [groeck: Fixed typo in CREDITS] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--CREDITS8
-rw-r--r--MAINTAINERS4
2 files changed, 10 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 8207cc62ee9d..af67a84517d7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue
S: Griffith, ACT 2603
S: Australia
+N: Andreas Herrmann
+E: herrmann.der.user@gmail.com
+E: herrmann.der.user@googlemail.com
+D: Key developer of x86/AMD64
+D: Author of AMD family 15h processor power monitoring driver
+D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
+S: Germany
+
N: Sebastian Hetze
E: she@lunetix.de
D: German Linux Documentation,
diff --git a/MAINTAINERS b/MAINTAINERS
index 69c8a9c3289a..e49f50ba0802 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -614,9 +614,9 @@ F: drivers/crypto/ccp/
F: include/linux/ccp.h
AMD FAM15H PROCESSOR POWER MONITORING DRIVER
-M: Andreas Herrmann <herrmann.der.user@googlemail.com>
+M: Huang Rui <ray.huang@amd.com>
L: lm-sensors@lm-sensors.org
-S: Maintained
+S: Supported
F: Documentation/hwmon/fam15h_power
F: drivers/hwmon/fam15h_power.c