Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"An e-mail address update, and fix a compile error on SPARC"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: Only include of_match_table with CONFIG_OF_GPIO
hwmon, fam15h_power: Change email address, MAINTAINERS entry
+6
-4
+1
-1
Documentation/hwmon/fam15h_power
+1
-1
Documentation/hwmon/fam15h_power
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
503
503
F: include/linux/altera_jtaguart.h
504
504
505
505
AMD FAM15H PROCESSOR POWER MONITORING DRIVER
506
-
M: Andreas Herrmann <andreas.herrmann3@amd.com>
506
+
M: Andreas Herrmann <herrmann.der.user@googlemail.com>
507
507
L: lm-sensors@lm-sensors.org
508
508
S: Maintained
509
509
F: Documentation/hwmon/fam15h_power
+2
-2
drivers/hwmon/fam15h_power.c
+2
-2
drivers/hwmon/fam15h_power.c
···
2
2
* fam15h_power.c - AMD Family 15h processor power monitoring
3
3
*
4
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
8
* This driver is free software; you can redistribute it and/or
···
28
28
#include <asm/processor.h>
29
29
30
30
MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
31
-
MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>");
31
+
MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
32
32
MODULE_LICENSE("GPL");
33
33
34
34
/* D18F3 */