Commit 9acc7bde authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon changes from Guenter Roeck:
 "Just e-mail address updates"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Update my e-mail address
  hwmon: (applesmc) correct email address for Jesper Juhl
parents ccce27c0 bb9a80e5
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* Based on hdaps.c driver: * Based on hdaps.c driver:
* Copyright (C) 2005 Robert Love <rml@novell.com> * Copyright (C) 2005 Robert Love <rml@novell.com>
* Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com> * Copyright (C) 2005 Jesper Juhl <jj@chaosbits.net>
* *
* Fan control based on smcFanControl: * Fan control based on smcFanControl:
* Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com> * Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>
......
...@@ -590,6 +590,6 @@ abort: ...@@ -590,6 +590,6 @@ abort:
module_i2c_driver(jc42_driver); module_i2c_driver(jc42_driver);
MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>"); MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
MODULE_DESCRIPTION("JC42 driver"); MODULE_DESCRIPTION("JC42 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -567,6 +567,6 @@ static struct i2c_driver pem_driver = { ...@@ -567,6 +567,6 @@ static struct i2c_driver pem_driver = {
module_i2c_driver(pem_driver); module_i2c_driver(pem_driver);
MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>"); MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver"); MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -292,6 +292,6 @@ static struct i2c_driver ltc4261_driver = { ...@@ -292,6 +292,6 @@ static struct i2c_driver ltc4261_driver = {
module_i2c_driver(ltc4261_driver); module_i2c_driver(ltc4261_driver);
MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>"); MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
MODULE_DESCRIPTION("LTC4261 driver"); MODULE_DESCRIPTION("LTC4261 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -692,6 +692,6 @@ static struct i2c_driver max16065_driver = { ...@@ -692,6 +692,6 @@ static struct i2c_driver max16065_driver = {
module_i2c_driver(max16065_driver); module_i2c_driver(max16065_driver);
MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>"); MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
MODULE_DESCRIPTION("MAX16065 driver"); MODULE_DESCRIPTION("MAX16065 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment