summaryrefslogtreecommitdiffstats
path: root/Documentation/i2c/busses/i2c-parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 03:56:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 03:56:27 +0100
commit9076e0cae70c5d6ddb9a0284a20885b2b8814416 (patch)
tree1b30be795ac206c48e59738cc57a71a393bf7337 /Documentation/i2c/busses/i2c-parport
parentMerge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff)
parentUpdate Jean Delvare's e-mail address (diff)
downloadlinux-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/i2c/busses/i2c-parport')
-rw-r--r--Documentation/i2c/busses/i2c-parport2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/busses/i2c-parport b/Documentation/i2c/busses/i2c-parport
index 2461c7b53b2c..0e2d17b460fd 100644
--- a/Documentation/i2c/busses/i2c-parport
+++ b/Documentation/i2c/busses/i2c-parport
@@ -1,6 +1,6 @@
Kernel driver i2c-parport
-Author: Jean Delvare <khali@linux-fr.org>
+Author: Jean Delvare <jdelvare@suse.de>
This is a unified driver for several i2c-over-parallel-port adapters,
such as the ones made by Philips, Velleman or ELV. This driver is