diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 13:43:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 13:43:35 -0400 |
commit | 7e75224188460ef2e6a6096e912aa4682ab76486 (patch) | |
tree | 99a3e77d20928ab4141909ce77b4fd25b83aaa3a /drivers/hwmon/ibmpex.c | |
parent | bebcb928c820d0ee83aca4b192adc195e43e66a2 (diff) | |
parent | f060c658b820141f18abd7b71586d628464a03ea (diff) |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- new driver for HTU21D (humidity sensor)
- add support for Fam16h (Kabini) to k10temp
- add support for NCT6102D/6106D and NCT6791D to nct6775 driver
- add support for ADS1115 to ads1015 driver
- add support for hibernate to w83627ehf and nct6775 drivers
- some minor cleanups
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (htu21) Add Measurement Specialties HTU21D support
hwmon: Change my email address.
hwmon: (k10temp) Add support for Fam16h (Kabini)
hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0
hwmon: (ads1015) Add support for ADS1115
hwmon: (w83627ehf) Add support for hibernate
hwmon: (nct6775) Add support for hibernate
hwmon: use dev_get_platdata()
hwmon: (nct6775) Fix size of data->temp array
hwmon: (nct6775) Avoid using device platform data outside probe function
hwmon: (nct6775) Add support for NCT6791D
hwmon: (nct6775) Add support for beep attributes
hwmon: (nct6775) Add support for critical low/high temperature limits on NCT6106
hwmon: (nct6775) Add support for NCT6102D/6106D
hwmon: (nct6775) Support two SuperIO chips in the same system
hwmon: (nct6775) Allocate attributes dynamically from templates
hwmon: (coretemp) Atom CPUs don't support TjMax; no warning needed
Diffstat (limited to 'drivers/hwmon/ibmpex.c')
-rw-r--r-- | drivers/hwmon/ibmpex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index 74b365ea01c7..20ab0fb85395 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * A hwmon driver for the IBM PowerExecutive temperature/power sensors | 2 | * A hwmon driver for the IBM PowerExecutive temperature/power sensors |
3 | * Copyright (C) 2007 IBM | 3 | * Copyright (C) 2007 IBM |
4 | * | 4 | * |
5 | * Author: Darrick J. Wong <djwong@us.ibm.com> | 5 | * Author: Darrick J. Wong <darrick.wong@oracle.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -606,7 +606,7 @@ static void __exit ibmpex_exit(void) | |||
606 | ibmpex_bmc_delete(p); | 606 | ibmpex_bmc_delete(p); |
607 | } | 607 | } |
608 | 608 | ||
609 | MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>"); | 609 | MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>"); |
610 | MODULE_DESCRIPTION("IBM PowerExecutive power/temperature sensor driver"); | 610 | MODULE_DESCRIPTION("IBM PowerExecutive power/temperature sensor driver"); |
611 | MODULE_LICENSE("GPL"); | 611 | MODULE_LICENSE("GPL"); |
612 | 612 | ||