diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
| commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
| tree | 8200248706960af8b779e9144f5b51c670602228 /drivers/hwmon/lineage-pem.c | |
| parent | 22076c7712be29a602de45b1c573f31adbd428a9 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'drivers/hwmon/lineage-pem.c')
| -rw-r--r-- | drivers/hwmon/lineage-pem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c index d264937c7f5e..bd75d2415432 100644 --- a/drivers/hwmon/lineage-pem.c +++ b/drivers/hwmon/lineage-pem.c | |||
| @@ -567,6 +567,6 @@ static struct i2c_driver pem_driver = { | |||
| 567 | 567 | ||
| 568 | module_i2c_driver(pem_driver); | 568 | module_i2c_driver(pem_driver); |
| 569 | 569 | ||
| 570 | MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>"); | 570 | MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>"); |
| 571 | MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver"); | 571 | MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver"); |
| 572 | MODULE_LICENSE("GPL"); | 572 | MODULE_LICENSE("GPL"); |