summaryrefslogtreecommitdiffstats
path: root/Documentation/misc-devices
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-29 18:56:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-29 18:56:27 -0800
commit9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch)
tree1b30be795ac206c48e59738cc57a71a393bf7337 /Documentation/misc-devices
parentb7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff)
parent7c81c60f3789a082e141d7a013392af5f78db16a (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 'Documentation/misc-devices')
-rw-r--r--Documentation/misc-devices/eeprom2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/misc-devices/eeprom b/Documentation/misc-devices/eeprom
index f7e8104b576..ba692011f22 100644
--- a/Documentation/misc-devices/eeprom
+++ b/Documentation/misc-devices/eeprom
@@ -38,7 +38,7 @@ Supported chips:
Authors:
Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>,
- Jean Delvare <khali@linux-fr.org>,
+ Jean Delvare <jdelvare@suse.de>,
Greg Kroah-Hartman <greg@kroah.com>,
IBM Corp.