diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 03:56:27 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 03:56:27 +0100 |
commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /Documentation/hwmon/adm1025 | |
parent | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
parent | Update Jean Delvare's e-mail address (diff) | |
download | linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.xz linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.zip |
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/hwmon/adm1025')
-rw-r--r-- | Documentation/hwmon/adm1025 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/adm1025 b/Documentation/hwmon/adm1025 index 39d2b781b5d6..99f05049c68a 100644 --- a/Documentation/hwmon/adm1025 +++ b/Documentation/hwmon/adm1025 @@ -18,7 +18,7 @@ The NE1619 presents some differences with the original ADM1025: Authors: Chen-Yuan Wu <gwu@esoft.com>, - Jean Delvare <khali@linux-fr.org> + Jean Delvare <jdelvare@suse.de> Description ----------- |