Skip to content

Commit

Permalink
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
Linus Torvalds committed Jun 28, 2012
2 parents ccce27c + bb9a80e commit 9acc7bd
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/applesmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Based on hdaps.c driver:
* 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:
* Copyright (C) 2006 Hendrik Holtmann <holtmann@mac.com>
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/jc42.c
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,6 @@ static struct jc42_data *jc42_update_device(struct device *dev)

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_LICENSE("GPL");
2 changes: 1 addition & 1 deletion drivers/hwmon/lineage-pem.c
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,6 @@ static struct 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_LICENSE("GPL");
2 changes: 1 addition & 1 deletion drivers/hwmon/ltc4261.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,6 @@ static struct 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_LICENSE("GPL");
2 changes: 1 addition & 1 deletion drivers/hwmon/max16065.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,6 @@ static struct 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_LICENSE("GPL");

0 comments on commit 9acc7bd

Please sign in to comment.