Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / hwmon / max6642.c

diff --git a/drivers/hwmon/max6642.c b/drivers/hwmon/max6642.c
index 8326fbd601508d354f5a037aabdc5420b1018670..6520bc51d02a0f71faeb2456025f656bdc817b11 100644 (file)
--- a/drivers/hwmon/max6642.c
+++ b/drivers/hwmon/max6642.c
@@ -8,7 +8,7 @@
  *
  *  Based on the max1619 driver.
  *  Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net>
- *                          Jean Delvare <khali@linux-fr.org>
+ *                          Jean Delvare <jdelvare@suse.de>
  *
  * The MAX6642 is a sensor chip made by Maxim.
  * It reports up to two temperatures (its own plus up to