diff options
| author | Linus Torvalds <[email protected]> | 2014-01-30 02:56:27 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-01-30 02:56:27 +0000 |
| commit | 9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch) | |
| tree | 1b30be795ac206c48e59738cc57a71a393bf7337 /drivers/i2c/algos/i2c-algo-bit.c | |
| 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 | kernel-9076e0cae70c5d6ddb9a0284a20885b2b8814416.tar.gz kernel-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/algos/i2c-algo-bit.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index fad22b0bb5b0..b7a6acfcb300 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -20,7 +20,7 @@ * ------------------------------------------------------------------------- */ /* With some changes from Frodo Looijaard <[email protected]>, Kyösti Mälkki - <[email protected]> and Jean Delvare <[email protected]> */ + <[email protected]> and Jean Delvare <[email protected]> */ #include <linux/kernel.h> #include <linux/module.h> |