diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 02:56:27 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 02:56:27 (GMT) |
commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /drivers/hwmon/nct6775.c | |
parent | b7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff) | |
parent | 7c81c60f3789a082e141d7a013392af5f78db16a (diff) | |
download | linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.xz |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"This include it87 driver improvements, and a tree-wide change of my
e-mail address"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
Update Jean Delvare's e-mail address
hwmon: (it87) Print proper names for the IT8771E and IT8772E
hwmon: (it87) Add support for the ITE IT8603E
Diffstat (limited to 'drivers/hwmon/nct6775.c')
-rw-r--r-- | drivers/hwmon/nct6775.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 8686e96..38d5a63 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -5,7 +5,7 @@ * Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net> * * Derived from w83627ehf driver - * Copyright (C) 2005-2012 Jean Delvare <khali@linux-fr.org> + * Copyright (C) 2005-2012 Jean Delvare <jdelvare@suse.de> * Copyright (C) 2006 Yuan Mu (Winbond), * Rudolf Marek <r.marek@assembler.cz> * David Hubbard <david.c.hubbard@gmail.com> |