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

Commit 9076e0ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b7a8399e 7c81c60f

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg 
S: Germany



N: Jean Delvare

E: khali@linux-fr.org

W: http://khali.linux-fr.org/

E: jdelvare@suse.de

W: http://jdelvare.nerim.net/

D: Several hardware monitoring drivers

S: France

Documentation/hwmon/adm1025

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

-----------

Documentation/hwmon/adm1031

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Supported chips: 


Authors:

        Alexandre d'Alton <alex@alexdalton.org>

        Jean Delvare <khali@linux-fr.org>

        Jean Delvare <jdelvare@suse.de>



Description

-----------

Documentation/hwmon/adm9240

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Authors: 
    Philip Edelbrock <phil@netroedge.com>,

    Michiel Rook <michiel@grendelproject.nl>,

    Grant Coady <gcoady.lk@gmail.com> with guidance

        from Jean Delvare <khali@linux-fr.org>

        from Jean Delvare <jdelvare@suse.de>



Interface

---------

Documentation/hwmon/ds1621

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Authors: 
        Christian W. Zuckschwerdt <zany@triq.net>

        valuable contributions by Jan M. Sendler <sendler@sendler.de>

        ported to 2.6 by Aurelien Jarno <aurelien@aurel32.net>

        with the help of Jean Delvare <khali@linux-fr.org>

        with the help of Jean Delvare <jdelvare@suse.de>



Module Parameters

------------------