diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:56:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:56:27 -0800 |
| commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
| tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /drivers/i2c/i2c-core.c | |
| parent | b7a8399edfd7ad3da36d51513ea30a4708b02b52 (diff) | |
| parent | 7c81c60f3789a082e141d7a013392af5f78db16a (diff) | |
| download | linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.gz linux-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.bz2 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 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c4c5588ec0fb..82f7a5354dfe 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -21,7 +21,7 @@ /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>. All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and - Jean Delvare <khali@linux-fr.org> + Jean Delvare <jdelvare@suse.de> Mux support by Rodolfo Giometti <giometti@enneenne.com> and Michael Lawnick <michael.lawnick.ext@nsn.com> OF support is copyright (c) 2008 Jochen Friedrich <jochen@scram.de> |