diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 21:56:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 21:56:27 -0500 |
| commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
| tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /drivers/misc | |
| parent | b7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff) | |
| parent | 7c81c60f3789a082e141d7a013392af5f78db16a (diff) | |
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/misc')
| -rw-r--r-- | drivers/misc/eeprom/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index c169e07654cb..f0fa4e8ca124 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Philip Edelbrock <phil@netroedge.com> | 3 | * Philip Edelbrock <phil@netroedge.com> |
| 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> | 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> |
| 5 | * Copyright (C) 2003 IBM Corp. | 5 | * Copyright (C) 2003 IBM Corp. |
| 6 | * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> | 6 | * Copyright (C) 2004 Jean Delvare <jdelvare@suse.de> |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| 9 | * it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |