Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/hwmon/applesmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/hwmon/jc42.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/hwmon/lineage-pem.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/hwmon/ltc4261.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/hwmon/max16065.c

+1 −1
Original line number Diff line number Diff line
@@ -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");