diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:28:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:28:38 -0800 |
| commit | 2634bf2550f4dd7d2d4373725dbe4c4d2a6499fd (patch) | |
| tree | 4c0fd912793f81e3ab330e7546473e1746333ff4 /MAINTAINERS | |
| parent | e795e5f4e01de550bd8947a7db910daaf7773198 (diff) | |
| parent | 91918d13eb17b8c11a9b6b76bfdd7cc0efab4f50 (diff) | |
Merge tag 'hwmon-for-linus-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Notable hwmon changes:
- Add basic support for NCT6683 on Mitac boards
- Add support for AMD new 15h processors to fam15h_power driver
- Add pmbus client driver for LTC3815
- Remove htu21 driver (now supported by iio subsystem)"
* tag 'hwmon-for-linus-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards
hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures
hwmon: (nct6683,nct6775) constify sensor_template_group structures
MAINTAINERS: change the maintainer of fam15h_power driver
hwmon: (fam15h_power) Add support for AMD new 15h processors
hwmon: (pmbus) Add client driver for LTC3815
hwmon: (htu21) Remove driver
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a394704a9003..cbfb81b5ced5 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 |